Fixed bad conflict merge in PArtDesign

2020-04-20 13:34:38 +02:00
parent 0c326f094f
commit 2ce452c650
1 changed files with 1 additions and 4 deletions
--- 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