fix the conflict in Makefile

bigplaice · bigplaice · commit a4aa8741f108 · 2026-03-03T11:07:16.000+08:00
diff --git a/contrib/ivorysql_ora/Makefile b/contrib/ivorysql_ora/Makefile
@@ -77,11 +77,8 @@ ORA_REGRESS = \
 	dbms_utility \
 	ora_dbms_output \
 	ora_ascii \
-<<<<<<< dbms_lock
-        dbms_lock
-=======
+	dbms_lock \
 	utl_file
->>>>>>> master
 
 SHLIB_LINK += -lxml2
 
