CalvinBackup/erpnext
1
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-12 17:23:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] resolve conflicts

Browse Source
This commit is contained in:
Saurabh
2018-05-31 17:32:17 +05:30
parent c55f774fbf defecd3785
commit 0eb622f7da
25 changed files with 434 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -9,6 +9,9 @@ latest_updates.json
dist/
erpnext/docs/current
*.swp
<<<<<<< HEAD
*.swo
__pycache__
*~
=======
>>>>>>> master