From 37eae8eb4e1ca67a45306f99a08501dadfbf48e9 Mon Sep 17 00:00:00 2001
From: Gursheen Kaur Anand <40693548+GursheenK@users.noreply.github.com>
Date: Wed, 20 Mar 2024 19:58:01 +0530
Subject: [PATCH] chore: resolve 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 2d2633feff5..9f89078de67 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -928,11 +928,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",
@@ -1000,4 +996,4 @@
  "states": [],
  "timeline_field": "supplier",
  "title_field": "title"
-}
\ No newline at end of file
+}