chore: resolve conflicts

2024-07-24 13:03:43 +05:30
parent 56b1582027
commit 99d5b6dc71
3 changed files with 0 additions and 12 deletions
--- a/erpnext/accounts/doctype/journal_entry/journal_entry.json
+++ b/erpnext/accounts/doctype/journal_entry/journal_entry.json
@@ -557,11 +557,7 @@
   "table_fieldname": "payment_entries"
  }
 ],
-<<<<<<< HEAD
- "modified": "2023-11-23 12:11:04.128015",
-=======
 "modified": "2024-07-18 15:32:29.413598",
->>>>>>> e81373bb6a (chore: remove 'repost_required' from Journal Entry)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Journal Entry",
--- a/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
+++ b/erpnext/accounts/doctype/purchase_invoice/purchase_invoice.json
@@ -1609,11 +1609,7 @@
 "idx": 204,
 "is_submittable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2024-03-20 15:57:00.736868",
-=======
 "modified": "2024-07-18 15:31:49.488566",
->>>>>>> a467888a67 (chore: remove 'repost_required' from purchase invoice)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Purchase Invoice",
--- a/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
+++ b/erpnext/accounts/doctype/sales_invoice/sales_invoice.json
@@ -2183,11 +2183,7 @@
   "link_fieldname": "consolidated_invoice"
  }
 ],
-<<<<<<< HEAD
- "modified": "2024-05-08 18:02:28.549041",
-=======
 "modified": "2024-07-18 15:30:39.428519",
->>>>>>> 06c5334f2a (chore: remove stale 'repost_required' flag from sales invoice)
 "modified_by": "Administrator",
 "module": "Accounts",
 "name": "Sales Invoice",