diff --git a/tests/integration/targets/ecs_ecr/tasks/main.yml b/tests/integration/targets/ecs_ecr/tasks/main.yml index 033d186a099..97d8af03ba6 100644 --- a/tests/integration/targets/ecs_ecr/tasks/main.yml +++ b/tests/integration/targets/ecs_ecr/tasks/main.yml @@ -134,11 +134,7 @@ - name: When pulling an existing repository that has an existing policy ecs_ecr: -<<<<<<< HEAD name: '{{ ecr_name }}' -======= - name: {{ ecr_name }}' ->>>>>>> 08e485e (Add integration tests for pulling and printing policy) register: result - name: it should return the policy but not create or change