summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/selectordialog.cpp
diff options
context:
space:
mode:
authorJabier Arraiza <jabier.arraiza@marker.es>2019-06-08 19:06:51 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2019-06-08 19:06:51 +0000
commit3473bec48ef9b55fc29c8a10e22287839eb735ef (patch)
tree0988ff6d4ff7b43f17d5ce5337aba2ee9a125542 /src/ui/dialog/selectordialog.cpp
parentremove clang diff (diff)
downloadinkscape-3473bec48ef9b55fc29c8a10e22287839eb735ef.tar.gz
inkscape-3473bec48ef9b55fc29c8a10e22287839eb735ef.zip
fix rebase
Diffstat (limited to 'src/ui/dialog/selectordialog.cpp')
-rw-r--r--src/ui/dialog/selectordialog.cpp1
1 files changed, 0 insertions, 1 deletions
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) {