From 82982e25c6758d2fdcf22c62bd61dcd065759fb4 Mon Sep 17 00:00:00 2001
From: ruthra kumar <ruthra@erpnext.com>
Date: Wed, 18 Sep 2024 12:10:42 +0530
Subject: [PATCH] chore: resolve conflict

---
 erpnext/accounts/doctype/pricing_rule/pricing_rule.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
index ae76a7eebe1..ee9dd2be8c3 100644
--- a/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
+++ b/erpnext/accounts/doctype/pricing_rule/pricing_rule.json
@@ -648,11 +648,7 @@
  "icon": "fa fa-gift",
  "idx": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2024-05-17 13:16:34.496704",
-=======
  "modified": "2024-09-16 18:14:51.314765",
->>>>>>> 636c0131fa (fix: add currency in options for rate field in pricing rule)
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Pricing Rule",