[libgda: 4/5] Test: Fixing merge conflict

[Daniel Espinosa Ortiz <despinosa src gnome org>]

commit 725eb722e35526af209f5b2345bf3b404b99ac7e
Author: Pavlo Solntsev <p sun fun gmail com>
Date:   Fri Oct 22 22:39:02 2021 -0500

    Test: Fixing merge conflict

 tests/db/check-db-catalog.c | 4 ----
 1 file changed, 4 deletions(-)
---
diff --git a/tests/db/check-db-catalog.c b/tests/db/check-db-catalog.c
index e99ce6215..28285b1d3 100644
--- a/tests/db/check-db-catalog.c
+++ b/tests/db/check-db-catalog.c
@@ -217,16 +217,12 @@ test_db_catalog_finish_db (DbCatalogCnc *self,
                             G_GNUC_UNUSED gconstpointer user_data)
 {
   g_object_unref (self->cnc);
-<<<<<<< HEAD
   g_object_unref (self->catalog);
   g_object_unref (self->column_id);
   g_object_unref (self->column_name);
   g_object_unref (self->column_ctime);
   g_object_unref (self->column_ts);
-  g_object_unref (self->table);
   g_object_unref (self->view);
-=======
->>>>>>> master
 }
 
 static void