chore: resolve conflict

frappe · Dec 4, 2023 · b8b8c02 · b8b8c02
1 parent 192343d
commit b8b8c02
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/...accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json b/...accounts/doctype/payment_reconciliation_allocation/payment_reconciliation_allocation.json
@@ -156,11 +156,7 @@
  "is_virtual": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-09-03 07:52:33.684217",
-=======
  "modified": "2023-11-17 17:33:38.612615",
->>>>>>> 3a51a3f37e (refactor: convert payment reconciliation tool to virtual doctype)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Payment Reconciliation Allocation",