From 3473bec48ef9b55fc29c8a10e22287839eb735ef Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Sat, 8 Jun 2019 21:06:51 +0200
Subject: fix rebase

---
 src/ui/dialog/selectordialog.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'src')

diff --git a/src/ui/dialog/selectordialog.cpp b/src/ui/dialog/selectordialog.cpp
index 06a327246..cca029e2b 100644
--- a/src/ui/dialog/selectordialog.cpp
+++ b/src/ui/dialog/selectordialog.cpp
@@ -953,7 +953,6 @@ void SelectorDialog::_removeClass(SPObject *obj, const Glib::ustring &className,
                 classAttr.erase(i, tok.length());
             } else {
                 notfound = true;
->>>>>>> Fixes on selector dialog based in LGM input
             }
         }
         if (all && notfound) {
-- 
cgit v1.2.3