nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-25 16:04:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

[resolved] merge-conflicts

Browse Source
This commit is contained in:
Saurabh
2018-09-12 14:48:30 +05:30
parent 8dade79002 b3737c812a
commit 393dd4286a
18 changed files with 697 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/modules.txt
View File

@@ -11,7 +11,6 @@ Support
Utilities
Shopping Cart
Assets
Hub Node
Portal
Maintenance
Education
@@ -21,4 +20,4 @@ Restaurant
Agriculture
ERPNext Integrations
Non Profit
Hotels
Hotels