try to fix a bad merge

SofaDefrost · Jul 15, 2024 · b30c879 · b30c879
1 parent f23d6b5
commit b30c879
Showing 1 changed file with 7 additions and 18 deletions.
diff --git a/examples/python3/cosserat/cosseratObject.py b/examples/python3/cosserat/cosseratObject.py
@@ -21,26 +21,16 @@
     "buildCollisionModel": 1,
     "beamMass": 0.22,
 }
-<<<<<<< HEAD
-
-
-class Cosserat(Sofa.Prefab):
-    """Cosserat beam prefab class. It is a prefab class that allow to create a cosserat beam in Sofa.
-=======
-
 
 # @dataclass
-
-
 class Cosserat(Sofa.Prefab):
-    """ActuatedArm is a reusable sofa model of a S90 servo motor and the tripod actuation arm.
+    """Cosserat beam prefab class. It is a prefab class that allow to create a cosserat beam in Sofa.
     Parameters:
         -parent:        node where the ServoArm will be attached
          - translation the position in space of the structure
          - eulerRotation the orientation of the structure
          - attachingTo (MechanicalObject)    a rest shape force field will constraint the object
                                           to follow arm position
->>>>>>> master
     Structure:
     Node : {
          name : 'Cosserat'
@@ -53,12 +43,11 @@ class Cosserat(Sofa.Prefab):
     """
 
     prefabParameters = [
-<<<<<<< HEAD
-        {"name": "name", "type": "string",
-            "help": "Node name", "default": "Cosserat"},
-=======
-        {"name": "name", "type": "string", "help": "Node name", "default": "Cosserat"},
->>>>>>> master
+        {
+            "name": "name", 
+            "type": "string",
+            "help": "Node name", "default": "Cosserat"
+        },
         {
             "name": "position",
             "type": "Rigid3d::VecCoord",
@@ -313,7 +302,7 @@ def _extracted_from_addCosseratCoordinate_15(
     def addCosseratFrame(self, framesF, curv_abs_inputS, curv_abs_outputF):
         cosseratInSofaFrameNode = self.rigidBaseNode.addChild(
             "cosseratInSofaFrameNode")
-       self.cosseratCoordinateNode.addChild(cosseratInSofaFrameNode)
+        self.cosseratCoordinateNode.addChild(cosseratInSofaFrameNode)
         framesMO = cosseratInSofaFrameNode.addObject(
             "MechanicalObject",
             template="Rigid3d",