From 9ae5d213d1bf2f16435a1b095312988e746e6186 Mon Sep 17 00:00:00 2001 From: ilijabojanovic Date: Wed, 11 Dec 2024 17:20:48 +0100 Subject: [PATCH] 2st change --- libs/shared/src/constants.ts | 3 --- 1 file changed, 3 deletions(-) diff --git a/libs/shared/src/constants.ts b/libs/shared/src/constants.ts index 8a299c83992..37840d9ecf9 100644 --- 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';