chore: fix conflicts

Author: semoal

pg17/Dockerfile

@@ -26,7 +26,7 @@ ARG PG_MAJOR_VERSION
 ARG PG_VERSION
 ARG POSTGIS_MAJOR=3
 ARG HAPROXY_VERSION=3.3
-ARG REPMGR_VERSION=5.5.0+debpgdg-1.pgdg24.04+1
+ARG REPMGR_VERSION=5.5.0+debpgdg-3.pgdg24.04+1
 
 ENV PGDATA=/data/postgresql
 ENV PGPASSFILE=/data/.pgpass

pg17/Dockerfile-timescaledb

@@ -26,7 +26,7 @@ ARG PG_MAJOR_VERSION
 ARG PG_VERSION
 ARG POSTGIS_MAJOR=3
 ARG HAPROXY_VERSION=3.3
-ARG REPMGR_VERSION=5.5.0+debpgdg-1.pgdg24.04+1
+ARG REPMGR_VERSION=5.5.0+debpgdg-3.pgdg24.04+1
 
 ENV PGDATA=/data/postgresql
 ENV PGPASSFILE=/data/.pgpass

pg18/Dockerfile

@@ -26,7 +26,7 @@ ARG PG_MAJOR_VERSION
 ARG PG_VERSION
 ARG POSTGIS_MAJOR=3
 ARG HAPROXY_VERSION=3.3
-ARG REPMGR_VERSION=5.5.0+debpgdg-1.pgdg24.04+1
+ARG REPMGR_VERSION=5.5.0+debpgdg-3.pgdg24.04+1
 
 ENV PGDATA=/data/postgresql
 ENV PGPASSFILE=/data/.pgpass

pg18/Dockerfile-timescaledb

@@ -26,7 +26,7 @@ ARG PG_MAJOR_VERSION
 ARG PG_VERSION
 ARG POSTGIS_MAJOR=3
 ARG HAPROXY_VERSION=3.3
-ARG REPMGR_VERSION=5.5.0+debpgdg-1.pgdg24.04+1
+ARG REPMGR_VERSION=5.5.0+debpgdg-3.pgdg24.04+1
 
 ENV PGDATA=/data/postgresql
 ENV PGPASSFILE=/data/.pgpass