fix

fylein · Nov 10, 2023 · 0d6e958 · 0d6e958
1 parent efcea0c
commit 0d6e958
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/apps/accounting_exports/models.py b/apps/accounting_exports/models.py
@@ -120,11 +120,7 @@ def create_accounting_export(expense_objects: List[Expense], fund_source: str, w
         export_setting = ExportSetting.objects.get(workspace_id=workspace_id)
 
         # Group expenses based on specified fields and fund_source
-<<<<<<< HEAD
         accounting_exports = _group_expenses(expense_objects, export_setting, fund_source)
-=======
-        expense_groups = _group_expenses(expense_objects, export_setting, fund_source)
->>>>>>> 0816f9858c4079548252b65c27698780fc4bc220
 
         fund_source_map = {
             'PERSONAL': 'reimbursable',