[glom/glom-1-18] Fix a conflict.

[Murray Cumming <murrayc src gnome org>]

commit 4cd2b3c24738bd16a94b140405067bb8a32548a8
Author: Murray Cumming <murrayc murrayc com>
Date:   Wed Nov 16 14:57:15 2011 +0100

    Fix a conflict.

 glom/utility_widgets/db_adddel/db_adddel.h |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)
---
diff --git a/glom/utility_widgets/db_adddel/db_adddel.h b/glom/utility_widgets/db_adddel/db_adddel.h
index e38689a..1f6f622 100644
--- a/glom/utility_widgets/db_adddel/db_adddel.h
+++ b/glom/utility_widgets/db_adddel/db_adddel.h
@@ -415,17 +415,11 @@ private:
   Gtk::TreeView m_TreeView;
   #endif
 
-<<<<<<< HEAD
-
   Gtk::TreeModel::ColumnRecord m_ColumnRecord;
 
   //typedef Gtk::ListStore type_model_store;
   typedef DbTreeModel type_model_store;
   Glib::RefPtr<type_model_store> m_refListStore;
-=======
-private:
-  Glib::RefPtr<DbTreeModel> m_refListStore;
->>>>>>> edc483a... List view and Related Records: Disable buttons when appropriate.
 
   //Columns, not including the hidden internal columns:
   typedef std::vector<DbAddDelColumnInfo> type_ColumnTypes;