chore: resolve conflicts

2024-03-20 20:12:36 +05:30
parent e922ac7c31
commit 957f55f6b1
4 changed files with 0 additions and 16 deletions
--- a/erpnext/buying/doctype/purchase_order/purchase_order.json
+++ b/erpnext/buying/doctype/purchase_order/purchase_order.json
@@ -1273,11 +1273,7 @@
 "idx": 105,
 "is_submittable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2023-10-01 20:58:07.851037",
-=======
 "modified": "2024-03-20 16:03:31.611808",
->>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
 "modified_by": "Administrator",
 "module": "Buying",
 "name": "Purchase Order",
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -927,11 +927,7 @@
 "index_web_pages_for_search": 1,
 "is_submittable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2023-11-20 11:15:30.083077",
-=======
 "modified": "2024-03-20 16:03:59.069145",
->>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
 "modified_by": "Administrator",
 "module": "Buying",
 "name": "Supplier Quotation",
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -1072,11 +1072,7 @@
 "idx": 82,
 "is_submittable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2023-04-14 16:50:44.550098",
-=======
 "modified": "2024-03-20 16:04:21.567847",
->>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
 "modified_by": "Administrator",
 "module": "Selling",
 "name": "Quotation",
--- a/erpnext/stock/doctype/delivery_note/delivery_note.json
+++ b/erpnext/stock/doctype/delivery_note/delivery_note.json
@@ -1401,11 +1401,7 @@
 "idx": 146,
 "is_submittable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2023-12-18 17:19:39.368239",
-=======
 "modified": "2024-03-20 16:05:02.854990",
->>>>>>> 1c63983873 (fix: use Text Editor for rendering tax breakup table)
 "modified_by": "Administrator",
 "module": "Stock",
 "name": "Delivery Note",