Ready

Author: benflexcompute

flow360/cloud/flow360_requests.py

@@ -232,8 +232,6 @@ def _validate_force_creation_config(self):
                     f"cannot be later than 'up_to' ({self.up_to})."
                 )
         return self
-<<<<<<< HEAD
-=======
 
 
 class MoveToFolderRequestV2(Flow360RequestsV2):
@@ -251,4 +249,3 @@ class RenameAssetRequestV2(Flow360RequestsV2):
     """
 
     name: str = pd_v2.Field(description="case to rename")
->>>>>>> 113e6e41 (feat: add rename method to v2 assets (#1333))