resolving merge conflicts

1 job for !139 with msrivastava/resiliency-extension-legal in 3 minutes and 10 seconds
latest detached
Status Name Job ID Coverage
  Review
failed trigger-trusted-tests #531073
osdu-small

00:03:10

 
Name Stage Failure
failed
trigger-trusted-tests Review
Pipeline has been in state 'running' for 97 sec, waiting for completion
Pipeline has been in state 'running' for 107 sec, waiting for completion
Pipeline has been in state 'running' for 117 sec, waiting for completion
Pipeline has been in state 'running' for 2.1 min, waiting for completion
Pipeline has been in state 'failed' for 2 sec, waiting for completion
Pipeline completed in state failed in 2.2 min
Pipeline status is not 'success', exiting with error status
Cleaning up file based variables
ERROR: Job failed: exit code 1