chore: fix conflicts

frappe · Dec 12, 2024 · e515e02 · e515e02
1 parent 65e2684
commit e515e02
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/erpnext/selling/doctype/quotation_item/quotation_item.json b/erpnext/selling/doctype/quotation_item/quotation_item.json
@@ -691,11 +691,7 @@
  "idx": 1,
  "istable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-11-24 15:18:43.952844",
-=======
  "modified": "2024-12-12 13:49:17.765883",
->>>>>>> 9ef9ff3de8 (fix: make projected qty editable after submit (#44670))
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Quotation Item",