chore: resolve merge conflict

2024-03-02 15:59:48 +05:30
parent 46063518d7
commit 753223da78
2 changed files with 0 additions and 8 deletions
--- a/erpnext/controllers/tests/test_accounts_controller.py
+++ b/erpnext/controllers/tests/test_accounts_controller.py
@@ -1506,9 +1506,7 @@ class TestAccountsController(FrappeTestCase):
 				pluck="department",
 			),
 		)
-<<<<<<< HEAD
 		self.disable_dimensions()
-=======

 	def test_50_journal_against_journal(self):
 		# Invoice in Foreign Currency
@@ -1576,4 +1574,3 @@ class TestAccountsController(FrappeTestCase):
 		exc_je_for_je = self.get_journals_for(journal_as_payment.doctype, journal_as_payment.name)
 		self.assertEqual(exc_je_for_si, [])
 		self.assertEqual(exc_je_for_je, [])
->>>>>>> 8a5078b826 (test: gain/loss on Journals against Journals)