From 7c92ecdc9d04fb7565a9cfb6bc3436099b1cd2a8 Mon Sep 17 00:00:00 2001
From: Sagar Vora <sagar@resilient.tech>
Date: Mon, 20 Nov 2023 11:39:15 +0530
Subject: [PATCH] chore: resolve conflicts

---
 .../supplier_quotation.json                   | 53 +++++++++----------
 1 file changed, 24 insertions(+), 29 deletions(-)

diff --git a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
index dc8bc029ed2..aa89b81b5ed 100644
--- a/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
+++ b/erpnext/buying/doctype/supplier_quotation/supplier_quotation.json
@@ -852,27 +852,6 @@
    "label": "Named Place"
   },
   {
-<<<<<<< HEAD
-   "fieldname": "cost_center",
-   "fieldtype": "Link",
-   "label": "Cost Center",
-   "options": "Cost Center"
-  },
-  {
-   "fieldname": "project",
-   "fieldtype": "Link",
-   "label": "Project",
-   "options": "Project"
-  },
-  {
-   "fieldname": "dimension_col_break",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "accounting_dimensions_section",
-   "fieldtype": "Section Break",
-   "label": "Accounting Dimensions"
-=======
    "fieldname": "shipping_address",
    "fieldtype": "Link",
    "label": "Shipping Address",
@@ -880,8 +859,8 @@
    "print_hide": 1
   },
   {
-   "fieldname": "column_break_zjaq",
-   "fieldtype": "Column Break"
+    "fieldname": "column_break_zjaq",
+    "fieldtype": "Column Break"
   },
   {
    "fieldname": "shipping_address_display",
@@ -920,7 +899,27 @@
    "fieldtype": "Small Text",
    "label": "Billing Address Details",
    "read_only": 1
->>>>>>> c2bda2c705 (fix: Supplier Quotation fields (#37963))
+  },
+  {
+   "fieldname": "cost_center",
+   "fieldtype": "Link",
+   "label": "Cost Center",
+   "options": "Cost Center"
+  },
+  {
+   "fieldname": "project",
+   "fieldtype": "Link",
+   "label": "Project",
+   "options": "Project"
+  },
+  {
+   "fieldname": "dimension_col_break",
+   "fieldtype": "Column Break"
+  },
+  {
+   "fieldname": "accounting_dimensions_section",
+   "fieldtype": "Section Break",
+   "label": "Accounting Dimensions"
   }
  ],
  "icon": "fa fa-shopping-cart",
@@ -928,11 +927,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-11-17 12:34:30.083077",
-=======
- "modified": "2023-11-03 13:21:40.172508",
->>>>>>> c2bda2c705 (fix: Supplier Quotation fields (#37963))
+ "modified": "2023-11-20 11:15:30.083077",
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier Quotation",