Fix pull request: Fix startup issues in python3

plone · Sep 14, 2018 · 08a3671 · 08a3671
1 parent 348287c
commit 08a3671
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/Products/PlonePAS/tools/groupdata.py b/src/Products/PlonePAS/tools/groupdata.py
@@ -514,15 +514,9 @@ def canWriteProperty(self, prop_name):
                     break  # shadowed by read-only
         return 0
 
-<<<<<<< HEAD
     canAddToGroup = MemberData.canAddToGroup.__func__
     canRemoveFromGroup = MemberData.canRemoveFromGroup.__func__
     canAssignRole = MemberData.canAssignRole.__func__
-=======
-    canAddToGroup = MemberData.canAddToGroup
-    canRemoveFromGroup = MemberData.canRemoveFromGroup
-    canAssignRole = MemberData.canAssignRole
->>>>>>> fix startup in python3
 
     # plugin getters