From 390b4986f9b210a5c45866fbb644e440dda0f056 Mon Sep 17 00:00:00 2001 From: rohitwaghchaure Date: Sun, 31 Mar 2024 11:41:00 +0530 Subject: [PATCH] chore: fix conflicts --- .../buying/doctype/supplier_quotation/supplier_quotation.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json index c898d91405e..4a8cd8bf9e6 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": "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",