Skip to content

Commit 4d71276

Browse files
committed
Fix copypasta issue with supervisord config
1 parent fef1abf commit 4d71276

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

contrib/supervisord.conf

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,11 @@ stderr_logfile = /dev/stderr
3434
stderr_logfile_maxbytes = 0
3535

3636
[program:celery]
37+
<<<<<<< Updated upstream
3738
command = celery worker -A readthedocsinc -Q default,celery,web,builder -l DEBUG -c 2
39+
=======
40+
command = celery worker -A readthedocs -Q default,celery,web,builder -l DEBUG -c 2
41+
>>>>>>> Stashed changes
3842
directory = ../
3943
priority = 100
4044
stopasgroup = True

0 commit comments

Comments
 (0)