I committed a merge conflict tag by mistake, because I am an idiot

alephdata · Jun 1, 2022 · f9d645d · f9d645d
1 parent 87d0d99
commit f9d645d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -80,11 +80,7 @@ services:
       - aleph.env
 
   api:
-<<<<<<< HEAD
-    image: alephdata/aleph:${ALEPH_TAG:-3.12.2}
-=======
     image: alephdata/aleph:${ALEPH_TAG:-3.12.3}
->>>>>>> main
     command: gunicorn -w 6 -b 0.0.0.0:8000 --timeout 3600 --log-level debug --log-file - aleph.wsgi:app
     expose:
       - 8000