From 6818724008205aa316b4c1faa28c0caef84e9c0e Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Sat, 20 Apr 2019 23:35:53 +0200
Subject: Fix merge

---
 src/ui/dialog/selectordialog.cpp | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'src')

diff --git a/src/ui/dialog/selectordialog.cpp b/src/ui/dialog/selectordialog.cpp
index cb7b93cd9..6e834ffb2 100644
--- a/src/ui/dialog/selectordialog.cpp
+++ b/src/ui/dialog/selectordialog.cpp
@@ -31,6 +31,7 @@
 #include <map>
 #include <utility>
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 //#define DEBUG_SELECTORDIALOG
 //#define G_LOG_DOMAIN "SELECTORDIALOG"
@@ -38,6 +39,10 @@
 //#define DEBUG_selectorDialog
 //#define G_LOG_DOMAIN "selectorDialog"
 >>>>>>> Updating fixes on compiling
+=======
+//#define DEBUG_SELECTORDIALOG
+//#define G_LOG_DOMAIN "SELECTORDIALOG"
+>>>>>>> Fix merge
 
 using Inkscape::DocumentUndo;
 using Inkscape::Util::List;
@@ -57,12 +62,17 @@ namespace Dialog {
 // Keeps a watch on style element
 class SelectorDialog::NodeObserver : public Inkscape::XML::NodeObserver {
 public:
+<<<<<<< HEAD
     NodeObserver(SelectorDialog* selectorDialog) :
 <<<<<<< HEAD
         _selectorDialog(selectorDialog)
 =======
         _selectordialog(selectorDialog)
 >>>>>>> Updating fixes on compiling
+=======
+    NodeObserver(SelectorDialog* selectordialog) :
+        _selectordialog(selectordialog)
+>>>>>>> Fix merge
     {
         g_debug("SelectorDialog::NodeObserver: Constructor");
     };
@@ -102,12 +112,17 @@ SelectorDialog::NodeObserver::notifyContentChanged(
 // (Must update objects that selectors match.)
 class SelectorDialog::NodeWatcher : public Inkscape::XML::NodeObserver {
 public:
+<<<<<<< HEAD
     NodeWatcher(SelectorDialog* selectorDialog, Inkscape::XML::Node *repr) :
 <<<<<<< HEAD
         _selectorDialog(selectorDialog),
 =======
         _selectordialog(selectorDialog),
 >>>>>>> Updating fixes on compiling
+=======
+    NodeWatcher(SelectorDialog* selectordialog, Inkscape::XML::Node *repr) :
+        _selectordialog(selectordialog),
+>>>>>>> Fix merge
         _repr(repr)
     {
         g_debug("SelectorDialog::NodeWatcher: Constructor");
@@ -260,6 +275,7 @@ SelectorDialog::TreeStore::on_row_deleted(const TreeModel::Path& path)
 }
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 Glib::RefPtr<SelectorDialog::TreeStore> SelectorDialog::TreeStore::create(SelectorDialog *selectordialog)
 {
@@ -271,6 +287,12 @@ Glib::RefPtr<SelectorDialog::TreeStore> SelectorDialog::TreeStore::create(Select
     SelectorDialog::TreeStore * store = new SelectorDialog::TreeStore();
     store->_selectordialog = selectorDialog;
 >>>>>>> Updating fixes on compiling
+=======
+Glib::RefPtr<SelectorDialog::TreeStore> SelectorDialog::TreeStore::create(SelectorDialog *selectordialog)
+{
+    SelectorDialog::TreeStore * store = new SelectorDialog::TreeStore();
+    store->_selectordialog = selectordialog;
+>>>>>>> Fix merge
     store->set_column_types( store->_selectordialog->_mColumns );
     return Glib::RefPtr<SelectorDialog::TreeStore>( store );
 }
-- 
cgit v1.2.3