rebase PR

Author: madtibo

sqlserver2pgsql.pl

@@ -52,11 +52,8 @@
 our $use_pk_if_possible;
 our $pforce_ssl;
 our $stringtype_unspecified;
-<<<<<<< HEAD
 our $skip_citext_length_check;
-=======
 our $create_generated_always;
->>>>>>> Add option to convert Identity columns to "GENERATED ALWAYS AS IDENTITY" columns
 
 # Will be set if we detect GIS objects
 our $requires_postgis=0;
@@ -113,11 +110,8 @@ sub parse_conf_file
       'ignore errors'            => 'ignore_errors',
       'postgresql force ssl'     => 'pforce_ssl',
       'stringtype unspecified'   => 'stringtype_unspecified',
-<<<<<<< HEAD
-      'skip citext length check'   => 'skip_citext_length_check',
-=======
-      'create generated always'   => 'create_generated_always',
->>>>>>> Add option to convert Identity columns to "GENERATED ALWAYS AS IDENTITY" columns
+      'skip citext length check' => 'skip_citext_length_check',
+      'create generated always'  => 'create_generated_always',
    );
 
    # Open the conf file or die
@@ -168,11 +162,8 @@ sub set_default_conf_values
     $sp=1433 unless (defined ($sp));
     $pforce_ssl=0 unless (defined ($pforce_ssl));
     $stringtype_unspecified=0 unless (defined ($stringtype_unspecified));
-<<<<<<< HEAD
     $skip_citext_length_check=0 unless (defined ($skip_citext_length_check));
-=======
     $create_generated_always=0 unless (defined ($create_generated_always));
->>>>>>> Add option to convert Identity columns to "GENERATED ALWAYS AS IDENTITY" columns
 }
 
 # Converts numeric(4,0) and similar to int, bigint, smallint