Fix shitpost

agjohnson · agjohnson · commit f93e509f1a1c · 2017-11-23T12:47:45.000-07:00
diff --git a/contrib/supervisord.conf b/contrib/supervisord.conf
@@ -34,11 +34,7 @@ stderr_logfile = /dev/stderr
 stderr_logfile_maxbytes = 0
 
 [program:celery]
-<<<<<<< Updated upstream
-command = celery worker -A readthedocsinc -Q default,celery,web,builder -l DEBUG -c 2
-=======
 command = celery worker -A readthedocs -Q default,celery,web,builder -l DEBUG -c 2
->>>>>>> Stashed changes
 directory = ../
 priority = 100
 stopasgroup = True
