chore: resolve conflict

frappe · Sep 18, 2024 · 82982e2 · 82982e2
1 parent 782c9dd
commit 82982e2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git 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",