Fix lost confilct artefact

Author: vbwagner

src/include/pg_config.h.win32

@@ -577,7 +577,7 @@
 #define PGPRO_VERSION "9.6.4.1"
 
 #define PGPRO_PACKAGE_STR "PostgresPro 9.6.4.1"
-=======
+
 #define PG_VERSION_NUM 90604
 
 /* Define to the one symbol short name of this package. */