fix(setup-postgres): it helps to remove *all* conflict markers before pushing

hunleyd · hunleyd · commit 8083f1f5615a · 2025-10-24T16:03:27.000-04:00
diff --git a/ansible/tasks/setup-postgres.yml b/ansible/tasks/setup-postgres.yml
@@ -157,7 +157,6 @@
       loop_control:
         loop_var: 'pg_config_item'
 
-<<<<<<< HEAD
 - name: Allow adminapi to write custom config
   file:
     path: '{{ item }}'
