From c20def5d59eb0213c492d85e356b88f94fc91672 Mon Sep 17 00:00:00 2001
From: Raffael Meyer <14891507+barredterra@users.noreply.github.com>
Date: Tue, 26 Nov 2024 21:12:39 +0100
Subject: [PATCH] chore: resolve conflicts

---
 erpnext/accounts/doctype/dunning/dunning.json | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/erpnext/accounts/doctype/dunning/dunning.json b/erpnext/accounts/doctype/dunning/dunning.json
index 85ce6d555d3..496097417ba 100644
--- a/erpnext/accounts/doctype/dunning/dunning.json
+++ b/erpnext/accounts/doctype/dunning/dunning.json
@@ -400,11 +400,7 @@
  ],
  "is_submittable": 1,
  "links": [],
-<<<<<<< HEAD
- "modified": "2023-06-15 15:46:53.865712",
-=======
  "modified": "2024-11-26 13:46:07.760867",
->>>>>>> e094473c65 (feat(Dunning): separate tab "Address & Contact" (#44363))
  "modified_by": "Administrator",
  "module": "Accounts",
  "name": "Dunning",
@@ -458,4 +454,4 @@
  "states": [],
  "title_field": "customer_name",
  "track_changes": 1
-}
\ No newline at end of file
+}