From 80f0d5b5ec8d20d70ec091650dba8ece6f2851c6 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Wed, 20 Nov 2024 12:51:29 +0530
Subject: [PATCH] chore: resolve conflict

---
 .../selling/doctype/quotation/quotation.json  | 38 -------------------
 1 file changed, 38 deletions(-)

diff --git a/erpnext/selling/doctype/quotation/quotation.json b/erpnext/selling/doctype/quotation/quotation.json
index 8d6b96c8e67..d6ee87b5dee 100644
--- a/erpnext/selling/doctype/quotation/quotation.json
+++ b/erpnext/selling/doctype/quotation/quotation.json
@@ -1070,57 +1070,19 @@
    "fieldname": "named_place",
    "fieldtype": "Data",
    "label": "Named Place"
-<<<<<<< HEAD
-=======
-  },
-  {
-   "fieldname": "utm_campaign",
-   "fieldtype": "Link",
-   "label": "Campaign",
-   "oldfieldname": "campaign",
-   "oldfieldtype": "Link",
-   "options": "UTM Campaign",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "utm_source",
-   "fieldtype": "Link",
-   "label": "Source",
-   "oldfieldname": "source",
-   "oldfieldtype": "Select",
-   "options": "UTM Source",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "utm_medium",
-   "fieldtype": "Link",
-   "label": "Medium",
-   "options": "UTM Medium",
-   "print_hide": 1
-  },
-  {
-   "fieldname": "utm_content",
-   "fieldtype": "Data",
-   "label": "Content",
-   "print_hide": 1
   },
   {
    "default": "0",
    "fieldname": "disable_rounded_total",
    "fieldtype": "Check",
    "label": "Disable Rounded Total"
->>>>>>> f8524d526b (fix: added disable_rounded_total field)
   }
  ],
  "icon": "fa fa-shopping-cart",
  "idx": 82,
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-03-20 16:04:21.567847",
-=======
  "modified": "2024-11-07 18:37:11.715189",
->>>>>>> f8524d526b (fix: added disable_rounded_total field)
  "modified_by": "Administrator",
  "module": "Selling",
  "name": "Quotation",