From da1a948a2842eabea89e2cada04548d6260a47ea Mon Sep 17 00:00:00 2001
From: Deepesh Garg <deepeshgarg6@gmail.com>
Date: Tue, 14 Jun 2022 11:36:43 +0530
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/selling/doctype/quotation/quotation.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index c819dafd106..eeaa4fda585 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -1174,11 +1174,7 @@
  "idx": 82,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2022-03-23 16:49:36.297403",
-=======
  "modified": "2022-06-11 20:35:32.635804",
->>>>>>> 118c786e63 (fix: Partially Ordered status for quotation)
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Quotation",
@@ -1274,4 +1270,4 @@
  "sort_order": "DESC",
  "timeline_field": "party_name",
  "title_field": "title"
-}
\ No newline at end of file
+}