fix error

akretion · Jan 9, 2024 · 38780d3 · 38780d3
1 parent 7df68b8
commit 38780d3
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/wms_connector/models/synchronize_exportable_mixin.py b/wms_connector/models/synchronize_exportable_mixin.py
@@ -73,15 +73,10 @@ def _get_wms_export_task(self):
         raise NotImplementedError
 
     # TODO cleanup this code
-<<<<<<< HEAD
     # We should just have a method that return the data
     # and a generic one that return the vals
-    def _format_to_exportfile(self, name, data):
-        return self._format_to_exportfile_csv(name, data)
-=======
     def _format_to_exportfile(self, data):
         return self._format_to_exportfile_csv(data)
->>>>>>> a7bdc61d (revert unnecessary changes)
 
     def _format_to_exportfile_csv(self, data):
         csv_file = StringIO()