More update

build-week · Mar 30, 2019 · bf1ab95 · bf1ab95
1 parent 40bbd90
commit bf1ab95
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/config/supervisor/supervisor.conf b/config/supervisor/supervisor.conf
@@ -57,15 +57,12 @@ stderr_logfile = /var/log/supervisord/camera-stderr.log
 stdout_logfile = /var/log/supervisord/camera-stdout.log
 stopsignal=INT
 
-<<<<<<< HEAD
 [program:fiducial_detection]
 command=/jet/bin/run/fiducial_detection_balsaq_main
 stderr_logfile = /var/log/supervisord/fiducial_detection_balsaq_main-stderr.log
 stdout_logfile = /var/log/supervisord/fiducial_detection_balsaq_main-stdout.log
 stopsignal=INT
 
-=======
->>>>>>> Local modifications
 [program:pose_filter]
 command=/jet/bin/run/filter_balsaq_main
 stderr_logfile = /var/log/supervisord/filter-stderr.log
@@ -79,11 +76,7 @@ stdout_logfile = /var/log/supervisord/controller-stdout.log
 stopsignal=INT
 
 [program:gonogo_bq]
-<<<<<<< HEAD
 command=/jet/bin/run/gonogo_bq_main
-=======
-command=/jet/run/gonogo_bq
->>>>>>> Local modifications
 stderr_logfile = /var/log/supervisord/gonogo_bq-stderr.log
 stdout_logfile = /var/log/supervisord/gonogo_bq-stdout.log
 stopsignal=INT