Remove rebase marker from .gitignore (#1488)

Author: reshke

.gitignore

@@ -10,14 +10,11 @@
 *.so.[0-9]
 *.so.[0-9].[0-9]
 *.so.[0-9].[0-9][0-9]
-<<<<<<< HEAD
 *.sl
 *.sl.[0-9]
 *.sl.[0-9].[0-9]
 *.sl.[0-9].[0-9][0-9]
 *.swp
-=======
->>>>>>> REL_16_9
 *.dylib
 *.dll
 *.exp
@@ -80,9 +77,6 @@ lib*.pc
 /CMakeLists.txt
 /compile_commands.json
 /tmp_install/
-<<<<<<< HEAD
 /.cache/
 /install/
-=======
 /portlock/
->>>>>>> REL_16_9

contrib/pg_visibility/pg_visibility.c

@@ -787,14 +787,7 @@ tuple_all_visible(Relation rel, HeapTuple tup, TransactionId OldestXmin, Buffer
 static void
 check_relation_relkind(Relation rel)
 {
-<<<<<<< HEAD
-	if (rel->rd_rel->relkind != RELKIND_RELATION &&
-		rel->rd_rel->relkind != RELKIND_MATVIEW &&
-		rel->rd_rel->relkind != RELKIND_TOASTVALUE &&
-		rel->rd_rel->relkind != RELKIND_DIRECTORY_TABLE)
-=======
 	if (!RELKIND_HAS_TABLE_AM(rel->rd_rel->relkind))
->>>>>>> REL_16_9
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("relation \"%s\" is of wrong relation kind",