chore: resolve conflict

2026-03-11 14:29:12 +00:00 · 2024-09-05 17:22:47 +05:30
parent efdc2173b2
commit cb64f90d7d
1 changed files with 3 additions and 3 deletions
--- a/erpnext/accounts/report/accounts_payable/accounts_payable.js
+++ b/erpnext/accounts/report/accounts_payable/accounts_payable.js
@@ -158,13 +158,13 @@ frappe.query_reports["Accounts Payable"] = {
 			fieldtype: "Check",
 		},
 		{
-<<<<<<< HEAD
 			fieldname: "in_party_currency",
 			label: __("In Party Currency"),
-=======
+			fieldtype: "Check",
+		},
+		{
 			fieldname: "handle_employee_advances",
 			label: __("Handle Employee Advances"),
->>>>>>> 257e13c299 (refactor: filter to toggle employee advance scenario in AP)
 			fieldtype: "Check",
 		},
 	],