From 31017774f63d0a9a8c46b748c6b2942207fbe09a Mon Sep 17 00:00:00 2001
From: rohitwaghchaure <rohitw1991@gmail.com>
Date: Sun, 31 Mar 2024 11:42:05 +0530
Subject: [PATCH] chore: fix conflicts

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

diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index a35719f81ad..d87db06a4a9 100644
--- 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": "2024-03-20 16:03:59.069145",
-=======
  "modified": "2024-03-28 10:20:30.231915",
->>>>>>> 9828d34b19 (fix: markdown to text editor set for supplier quotation)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier Quotation",
@@ -999,4 +995,4 @@
  "states": [],
  "timeline_field": "supplier",
  "title_field": "title"
-}
\ No newline at end of file
+}