remove unsupported for PG 9.4 since it has ben released

diff --git a/src/slonik/slonik.c b/src/slonik/slonik.c
index 5ab4cd9cb946ee540638c0a80726459c5a162dbc..b0e23e0308901b4f39eb5b43ac5b3581c2911e81 100644 (file)
--- a/src/slonik/slonik.c
+++ b/src/slonik/slonik.c
@@ -2074,17 +2074,17 @@ load_slony_base(SlonikStmt * stmt, int no_id)
        else if ((adminfo->pg_version >= 80400) && (adminfo->pg_version < 80500))       /* 8.4 */
        {
                use_major = 8;
-               use_minor = 4;
-       }
+               use_minor = 4;   
+       }               
        else if ((adminfo->pg_version >= 90000) && (adminfo->pg_version < 90500)) /* 9.x */
        {
                /**
-                * 9.0 to 9.4 are so far just like 8.4
+                * 9.0 and 9.1 and 9.2, 9.3,9.4 are so far just like 8.4
                 **/
                use_major = 8;
                use_minor = 4;
        }
-       else    /* above 9.2 ??? */
+       else    /* above 9.4 ??? */
        {
                use_major = 8;
                use_minor = 4;
@@ -2165,10 +2165,17 @@ load_slony_functions(SlonikStmt * stmt, int no_id)
                use_major = 8;
                use_minor = 4;
        }
+<<<<<<< HEAD
        else if ((adminfo->pg_version >= 90000) && (adminfo->pg_version < 90500)) /* 9.0 ... 9.4 */
        {
                /**
                 * 9.0 to 9.4 are so far just like 8.4
+=======
+       else if ((adminfo->pg_version >= 90000) && (adminfo->pg_version < 90500)) /* 9.0, 9.1, 9.2 */
+       {
+               /**
+                * 9.0 and 9.1 and 9.2 and 9.3,9.4 are so far just like 8.4
+>>>>>>> 7c22d3b... remove unsupported for PG 9.4 since it has ben released
                 */
                use_major = 8;
                use_minor = 4;