chore: Resolve conflicts

erpnext/buying/doctype/supplier_quotation/supplier_quotation.json

@@ -842,57 +842,6 @@
    "fieldname": "named_place",
    "fieldtype": "Data",
    "label": "Named Place"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "shipping_address",
-   "fieldtype": "Link",
-   "label": "Shipping Address",
-   "options": "Address",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "column_break_zjaq",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "shipping_address_display",
-   "fieldtype": "Small Text",
-   "label": "Shipping Address Details",
-   "print_hide": 1,
-   "read_only": 1
-  },
-  {
-   "fieldname": "shipping_address_section",
-   "fieldtype": "Section Break",
-   "label": "Shipping Address"
-  },
-  {
-   "fieldname": "supplier_address_section",
-   "fieldtype": "Section Break",
-   "label": "Supplier Address"
-  },
-  {
-   "fieldname": "company_billing_address_section",
-   "fieldtype": "Section Break",
-   "label": "Company Billing Address"
-  },
-  {
-   "fieldname": "billing_address",
-   "fieldtype": "Link",
-   "label": "Company Billing Address",
-   "options": "Address"
-  },
-  {
-   "fieldname": "column_break_gcth",
-   "fieldtype": "Column Break"
-  },
-  {
-   "fieldname": "billing_address_display",
-   "fieldtype": "Small Text",
-   "label": "Billing Address Details",
-   "read_only": 1
   },
   {
    "fieldname": "cost_center",
@@ -914,7 +863,6 @@
    "fieldname": "accounting_dimensions_section",
    "fieldtype": "Section Break",
    "label": "Accounting Dimensions"
->>>>>>> 089da459f7 (feat: Add accounting dimensions to Supplier Quotation)
   }
  ],
  "icon": "fa fa-shopping-cart",
@@ -922,11 +870,7 @@
  "index_web_pages_for_search": 1,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-06-03 16:20:15.880114",
-=======
  "modified": "2023-11-17 12:34:30.083077",
->>>>>>> 089da459f7 (feat: Add accounting dimensions to Supplier Quotation)
  "modified_by": "Administrator",
  "module": "Buying",
  "name": "Supplier Quotation",