chore: resolve merge conflict

erpnext/accounts/doctype/journal_entry/journal_entry.py

@@ -485,13 +485,8 @@ class JournalEntry(AccountsController):
 	def validate_against_jv(self):
 		for d in self.get("accounts"):
 			if d.reference_type == "Journal Entry":
-<<<<<<< HEAD
-				account_root_type = frappe.db.get_value("Account", d.account, "root_type")
-				if account_root_type == "Asset" and flt(d.debit) > 0:
-=======
 				account_root_type = frappe.get_cached_value("Account", d.account, "root_type")
 				if account_root_type == "Asset" and flt(d.debit) > 0 and not self.system_generated_gain_loss():
->>>>>>> 5b67631d40 (fix: allow gain/loss for Journals against Journals)
 					frappe.throw(
 						_(
 							"Row #{0}: For {1}, you can select reference document only if account gets credited"

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)