python /home/admin/mtr/script_for_cron.py -j datou_restart -m 50 -a '' -s datou_restart -M 0 -S 0 -U 101,101,101
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
0.68user 0.44system 0:00.81elapsed 139%CPU (0avgtext+0avgdata 64228maxresident)k
0inputs+0outputs (7major+14669minor)pagefaults 0swaps