Modifying output to be displayed based on feedback

tests/integration/targets/synchronize/tasks/main.yml

@@ -342,32 +342,9 @@
 - name: Cleanup
   ansible.builtin.file:
     state: absent
-<<<<<<< HEAD
     path: "{{ output_dir }}/{{ item }}"
   loop:
     - directory b/foo.txt
     - directory a/foo.txt
     - directory a
     - directory b
-=======
-    path: '{{output_dir}}/{{item}}'
-  with_items:
-  - foo.result
-  - bar.result
-- name: synchronize files without quiet option 
-  synchronize:
-    src: '{{output_dir}}/foo.txt'
-    dest: '{{output_dir}}/foo.result'
-  register: sync_result
-  ignore_errors: true
-- assert:
-    that:
-    - '''--quiet'' not in sync_result.cmd'
-- name: Cleanup
-  file:
-    state: absent
-    path: '{{output_dir}}/{{item}}'
-  with_items:
-  - foo.result
-  - bar.result
->>>>>>> 9dbedb6 (Adding tests, corrections)