nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-04-26 01:58:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: resolve conflicts

Browse Source
This commit is contained in:
Mihir Kandoi
2025-11-25 10:51:39 +05:30
committed by GitHub
parent e8e09cf8ea
commit 841f5c24ad
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
erpnext/selling/doctype/customer/customer.json
View File

@@ -610,11 +610,7 @@
"link_fieldname": "party"
}
],
<<<<<<< HEAD
"modified": "2025-03-05 10:01:47.885574",
=======
"modified": "2025-11-25 09:35:56.772949",
>>>>>>> c2b8b97d7d (fix: incorrect query filter when selecting primary customer adr (#50727))
"modified_by": "Administrator",
"module": "Selling",
"name": "Customer",
@@ -700,4 +696,4 @@
"states": [],
"title_field": "customer_name",
"track_changes": 1
}
}