chore: resolve conflicts

2022-05-03 12:21:06 +05:30
parent 0df96e1084
commit 366cd6171c
1 changed files with 2 additions and 6 deletions
--- a/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
+++ b/erpnext/accounts/doctype/payment_reconciliation/payment_reconciliation.js
@@ -38,10 +38,7 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
 				]
 			};
 		});
-<<<<<<< HEAD
-	},
-=======
-
+		
 		this.frm.set_query("cost_center", () => {
 			return {
 				"filters": {
@@ -50,8 +47,7 @@ erpnext.accounts.PaymentReconciliationController = frappe.ui.form.Controller.ext
 				}
 			}
 		});
-	}
->>>>>>> ab94b73e93 (fix: Cost center filter on payment reconciliation)
+	},

 	refresh: function() {
 		this.frm.disable_save();