chore: cleanup type

Author: samrose

ansible/vars.yml

@@ -9,15 +9,9 @@ postgres_major:
 
 # Full version strings for each major version
 postgres_release:
-<<<<<<< HEAD
   postgresorioledb-17: "17.0.1.067-orioledb-pgcron-5"
   postgres17: "17.4.1.017-pgcron-5"
   postgres15: "15.8.1.074-pgcron-5"
-=======
-  postgresorioledb-17: "17.0.1.067-orioledb-pgcron-4"
-  postgres17: "17.4.1.017-pgcron-4"
-  postgres15: "15.8.1.074-pgcron-4"
->>>>>>> 2ffe4abe (chore: bump versions)
 
 # Non Postgres Extensions
 pgbouncer_release: "1.19.0"