2st change

hicommonwealth · Dec 11, 2024 · 9ae5d21 · 9ae5d21
1 parent 2b30dfa
commit 9ae5d21
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/libs/shared/src/constants.ts b/libs/shared/src/constants.ts
@@ -22,15 +22,12 @@ export const DEFAULT_NAME = 'Anonymous';
 
 export const MAX_RECIPIENTS_PER_WORKFLOW_TRIGGER = 1_000;
 
-<<<<<<< HEAD
-=======
 export const PRODUCTION_DOMAIN = 'common.xyz';
 
 export const BLOG_SUBDOMAIN = `blog.${PRODUCTION_DOMAIN}`;
 
 export const DOCS_SUBDOMAIN = `docs.${PRODUCTION_DOMAIN}`;
 
->>>>>>> 02ea3589d0 (update domain constants)
 export const S3_RAW_ASSET_BUCKET_DOMAIN =
   's3.us-east-1.amazonaws.com/assets.commonwealth.im';
 export const S3_ASSET_BUCKET_CDN = 'assets.commonwealth.im';