schuetz3/schuetz3-erpnext
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Raffael Meyer
2024-11-26 21:12:39 +01:00
committed by GitHub
parent e0cb5f9ba8
commit c20def5d59
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/accounts/doctype/dunning/dunning.json
View File

@@ -400,11 +400,7 @@
], ],
"is_submittable": 1, "is_submittable": 1,
"links": [], "links": [],
<<<<<<< HEAD
"modified": "2023-06-15 15:46:53.865712",
=======
"modified": "2024-11-26 13:46:07.760867", "modified": "2024-11-26 13:46:07.760867",
>>>>>>> e094473c65 (feat(Dunning): separate tab "Address & Contact" (#44363))
"modified_by": "Administrator", "modified_by": "Administrator",
"module": "Accounts", "module": "Accounts",
"name": "Dunning", "name": "Dunning",