From 3581906033a84f93ac05f40761ffb6d405202c1d Mon Sep 17 00:00:00 2001 From: Mihir Kandoi Date: Tue, 3 Mar 2026 21:09:03 +0530 Subject: [PATCH] chore: resolve conflicts --- .../doctype/request_for_quotation/request_for_quotation.json | 4 ---- 1 file changed, 4 deletions(-) diff --git a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json index 3fa3511dfb4..448deceaef7 100644 --- a/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json +++ b/erpnext/buying/doctype/request_for_quotation/request_for_quotation.json @@ -350,11 +350,7 @@ "index_web_pages_for_search": 1, "is_submittable": 1, "links": [], -<<<<<<< HEAD - "modified": "2026-01-05 14:27:33.329810", -======= "modified": "2026-03-01 23:38:48.079274", ->>>>>>> 49d363b174 (fix: handle html email template separately in RFQ to avoid jinja context error) "modified_by": "Administrator", "module": "Buying", "name": "Request for Quotation",