file naming duplicate

changliao1025 · May 6, 2024 · 187b60b · 187b60b
1 parent c55736f
commit 187b60b
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 189 deletions.
diff --git a/pyflowline/configuration/pyflowline_read_configuration_file.py b/pyflowline/configuration/pyflowline_read_configuration_file.py
diff --git a/pyflowline/configuration/read_configuration_file.py b/pyflowline/configuration/read_configuration_file.py
@@ -8,21 +8,6 @@
 sDate_default = "{:04d}".format(pDate.year) + \
     "{:02d}".format(pDate.month) + "{:02d}".format(pDate.day)
 
-<<<<<<<< HEAD:pyflowline/configuration/read_configuration_file.py
-def pyflowline_read_configuration_file(
-        sFilename_configuration_in,
-        iFlag_standalone_in=None,
-        iFlag_use_mesh_dem_in=None,
-        iCase_index_in=None,
-        iResolution_index_in=None,
-        dResolution_degree_in=None,
-        dResolution_meter_in=None,
-        sMesh_type_in=None,
-        sModel_in=None,
-        sDate_in=None,
-        sDggrid_type_in=None,
-        sWorkspace_output_in=None):
-========
 
 def pyflowline_read_configuration_file(sFilename_configuration_in,
                                              iFlag_standalone_in=None,
@@ -36,7 +21,7 @@ def pyflowline_read_configuration_file(sFilename_configuration_in,
                                              sDate_in=None,
                                               sDggrid_type_in = None,
                                              sWorkspace_output_in=None):
->>>>>>>> main:pyflowline/configuration/pyflowline_read_configuration_file.py
+
     """read a model configuration
 
     Args: