chore: fix conflicts

2025-02-06 22:09:44 +05:30
parent 28cbce4356
commit 08a6f4e6d3
1 changed files with 1 additions and 5 deletions
--- a/erpnext/selling/doctype/sales_order/sales_order.json
+++ b/erpnext/selling/doctype/sales_order/sales_order.json
@@ -1655,11 +1655,7 @@
 "idx": 105,
 "is_submittable": 1,
 "links": [],
-<<<<<<< HEAD
- "modified": "2024-11-26 12:42:06.872527",
-=======
 "modified": "2025-02-06 16:02:20.320877",
->>>>>>> 33d03b1542 (fix: the project document timed out while opening)
 "modified_by": "Administrator",
 "module": "Selling",
 "name": "Sales Order",
@@ -1737,4 +1733,4 @@
 "title_field": "customer_name",
 "track_changes": 1,
 "track_seen": 1
-}
+}