From 3d9b46d9f32627ca24980ea56955351ab308943e Mon Sep 17 00:00:00 2001
From: AjinkyaDahale <ajinkyadahale@gmail.com>
Date: Sun, 5 Feb 2017 21:48:04 +0530
Subject: [PATCH] [Sketcher] corrected artifact introduced by faulty conflict
 resolution

---
 src/Mod/Sketcher/Gui/CommandConstraints.cpp | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Mod/Sketcher/Gui/CommandConstraints.cpp b/src/Mod/Sketcher/Gui/CommandConstraints.cpp
index 7eb5dc529bb3..1fae2f244ec3 100644
--- 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();