Fix merge

openfoodfacts · Sep 14, 2022 · 2daefca · 2daefca
1 parent a9c89e4
commit 2daefca
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,13 +13,10 @@ x-backend-conf: &backend-conf
     - POSTGRES_USER
     - POSTGRES_PASSWORD
     - ROBOTOFF_URL
-<<<<<<< HEAD
     - EVENTS_URL
     - EVENTS_USERNAME
     - EVENTS_PASSWORD
-=======
     - REDIS_URL
->>>>>>> 1e7d429684 (Connect to Redis)
     - GOOGLE_CLOUD_VISION_API_KEY
     - CROWDIN_PROJECT_IDENTIFIER
     - CROWDIN_PROJECT_KEY

diff --git a/lib/ProductOpener/Config2_docker.pm b/lib/ProductOpener/Config2_docker.pm
@@ -97,16 +97,14 @@ my $postgres_url = "postgresql://${postgres_user}:${postgres_password}\@${postgr
 # enable an in-site robotoff-asker in the product page
 $robotoff_url = $ENV{ROBOTOFF_URL};
 
-<<<<<<< HEAD
 # Set this to your instance of https://github.com/openfoodfacts/openfoodfacts-events
 # enable creating events for some actions (e.g. when a product is edited)
 $events_url = $ENV{EVENTS_URL};
 $events_username = $ENV{EVENTS_USERNAME};
 $events_password = $ENV{EVENTS_PASSWORD};
-=======
+
 # Set this to your instance of the search service to enable writes to it
 $redis_url = $ENV{REDIS_URL};
->>>>>>> 1e7d429684 (Connect to Redis)
 
 %server_options = (
         private_products => $producers_platform,  # 1 to make products visible only to the owner (producer platform)

diff --git a/lib/ProductOpener/Config2_sample.pm b/lib/ProductOpener/Config2_sample.pm
@@ -77,15 +77,13 @@ $crowdin_project_key = '';
 # enable an in-site robotoff-asker in the product page
 $robotoff_url = '';
 
-<<<<<<< HEAD
 # Set this to your instance of https://github.com/openfoodfacts/openfoodfacts-events
 # enable creating events for some actions (e.g. when a product is edited)
 $events_url = '';
 $events_username = '';
 $events_password = '';
-=======
+
 $redis_url = '';
->>>>>>> 1e7d429684 (Connect to Redis)
 
 %server_options = (