UJ: Pre-merge commit + push

somiibo · Sep 27, 2023 · 5d0ac9c · 5d0ac9c
1 parent 13b2b04
commit 5d0ac9c
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/_config.yml b/_config.yml
@@ -207,9 +207,6 @@ settings:
           enabled: true,
           config: {
             dsn: '',
-<<<<<<< HEAD
-            release: '',
-=======
             release: 'ultimate-jekyll-website',
             replaysSessionSampleRate: 0.1,
             replaysOnErrorSampleRate: 1.0,
@@ -226,7 +223,6 @@ settings:
           okButton: {
             text: 'Claim 15% Discount',
             link: '/pricing?utm_source=exitpopup&utm_medium=popup&utm_campaign=exitpopup',
->>>>>>> template
           },
         },
       },