python /home/admin/mtr/script_for_cron.py -j datou_current3 -m 20 -a ' -a 4910 ' -s datou_current_4910 -M 0 -S 0 -U 95,95,120
Traceback (most recent call last):
  File "prod/datou.py", line 11, in <module>
    from mtr.datou.datou_lib import ContextDatouExec, batchDatouExec, clientDatou, datouWsServer, datouWssServer, datouServer, datouReset, datouLocal, createDatouCurrent, SaveInfoMem, batchDatouCurrent, datouDisplay ,check_python_version
  File "/home/admin/workarea/git/Velours/python/mtr/datou/datou_lib.py", line 21, in <module>
    from mtr.database_queries.datou_queries import DatouQueries
  File "/home/admin/workarea/git/Velours/python/mtr/database_queries/datou_queries.py", line 8
    <<<<<<< HEAD
    ^
SyntaxError: invalid syntax
Command exited with non-zero status 1
1.02user 0.33system 0:01.34elapsed 100%CPU (0avgtext+0avgdata 63988maxresident)k
0inputs+8outputs (0major+14662minor)pagefaults 0swaps