[Sketcher] corrected artifact introduced by faulty conflict resolution

FreeCAD · Feb 10, 2017 · 3d9b46d · 3d9b46d
1 parent 3cf00a1
commit 3d9b46d
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
@@ -845,11 +845,7 @@ class DrawSketchHandlerGenConstraint: public DrawSketchHandler
 {
 public:
     DrawSketchHandlerGenConstraint(const char* cursor[], CmdSketcherConstraint *_cmd)
-<<<<<<< 60ae927fcbae5a873045551206a68d6b12c36d02
-        : selFilterGate(nullptr), constraintCursor(cursor), cmd(_cmd) {}
-=======
         : constraintCursor(cursor), cmd(_cmd) {}
->>>>>>> Replace some of the allowedSelSequences with more general form
     virtual ~DrawSketchHandlerGenConstraint()
     {
         Gui::Selection().rmvSelectionGate();