From 2ce452c6505f52cd5dfcc0252f69260e3a6f600b Mon Sep 17 00:00:00 2001
From: Yorik van Havre <yorik@uncreated.net>
Date: Mon, 20 Apr 2020 13:34:38 +0200
Subject: [PATCH] Fixed bad conflict merge in PArtDesign

---
 src/Mod/PartDesign/SprocketFeature.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Mod/PartDesign/SprocketFeature.py b/src/Mod/PartDesign/SprocketFeature.py
index 0cfa0c9adc..95977518cb 100644
--- a/src/Mod/PartDesign/SprocketFeature.py
+++ b/src/Mod/PartDesign/SprocketFeature.py
@@ -141,13 +141,10 @@ class ViewProviderSprocket:
 
 
 class SprocketTaskPanel:
-<<<<<<< HEAD
     """
     The editmode TaskPanel for Sprocket objects
     """
-=======
-    '''The editmode TaskPanel for Sprocket objects'''
->>>>>>> 07b2401c1... Converted class names from private to public, per feedback from pull request
+
     def __init__(self,obj,mode):
         self.obj = obj