chore: resolve conflicts

Sanket322 · Apr 11, 2024 · 550ca1f · 550ca1f
1 parent bbdd4ef
commit 550ca1f
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/india_compliance/gst_india/overrides/test_advance_payment_entry.py b/india_compliance/gst_india/overrides/test_advance_payment_entry.py
@@ -12,13 +12,9 @@
 from erpnext.accounts.doctype.unreconcile_payment.unreconcile_payment import (
     create_unreconcile_doc_for_selection,
 )
-<<<<<<< HEAD
-=======
 from erpnext.controllers.accounts_controller import (
     get_advance_payment_entries_for_regional,
 )
-from erpnext.controllers.stock_controller import show_accounting_ledger_preview
->>>>>>> 35c48a29 (test: test-cases for regional_overrides (#2006))
 
 from india_compliance.gst_india.utils.tests import create_transaction