chore: resolve conflicts

2024-11-26 21:12:39 +01:00
parent e0cb5f9ba8
commit c20def5d59
1 changed files with 1 additions and 5 deletions
--- 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
-}
+}