fixing merge conflict error

b8d9b773 · John Jarvis · f0721ca6 · b8d9b773
Commit b8d9b773 authored Jun 09, 2014 by John Jarvis
Show whitespace changes
Inline Side-by-side

Showing with 1 additions and 1 deletions

playbooks/roles/xqwatcher/templates/edx/app/supervisor/conf.d/xqwatcher.conf.j2
+1 -1

No files found.
--- a/playbooks/roles/xqwatcher/templates/edx/app/supervisor/conf.d/xqwatcher.conf.j2
+++ b/playbooks/roles/xqwatcher/templates/edx/app/supervisor/conf.d/xqwatcher.conf.j2
@@ -7,7 +7,7 @@
 {% set executable = xqwatcher_venv_dir + '/bin/python' %}
 {% endif %}

-[program:xqwatcher]
+[program:xqwatcher_service_name]
 command={{ executable }} -m {{ xqwatcher_module }} -d {{ xqwatcher_conf_dir }} 
 process_name=%(program_name)s
 user={{ xqwatcher_user }}