Fix merge remainings

citusdata · Dec 14, 2018 · 81269ea · 81269ea
1 parent 5e746f9
commit 81269ea
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/cstore_fdw.c b/cstore_fdw.c
@@ -1213,14 +1213,13 @@ cstore_fdw_handler(PG_FUNCTION_ARGS)
 	fdwRoutine->ExecForeignInsert = CStoreExecForeignInsert;
 	fdwRoutine->EndForeignModify = CStoreEndForeignModify;
 
-<<<<<<< HEAD
 #if PG_VERSION_NUM >= 110000
 	fdwRoutine->BeginForeignInsert = CStoreBeginForeignInsert;
 	fdwRoutine->EndForeignInsert = CStoreEndForeignInsert;
-=======
+#endif
+
 #if PG_VERSION_NUM >= 90600
 	fdwRoutine->IsForeignScanParallelSafe = CStoreIsForeignScanParallelSafe;
->>>>>>> fc6bd39... Mark foreign scan as parallel safe
 #endif
 
 	PG_RETURN_POINTER(fdwRoutine);