resolve conflicts

8 jobs for cg_resolve_conflicts in 2 minutes and 23 seconds (queued for 1 second)
Status Name Job ID Coverage
  Check Commit
passed check_added_files #5559823

00:00:18

passed check_grid_atlcvmfs #5559824

00:00:58

passed check_grid_size #5559825

00:01:31

passed check_jo_consistency #5559820

00:00:15

passed check_modified_files #5559822

00:00:14

passed check_unique_physicsShort #5559821

00:00:15

 
  Run Athena
passed run_athena #5559826

00:00:19

 
  Check Output
passed check_logParser #5559827

00:00:32