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

[merge] fix

Browse Source
This commit is contained in:
Rushabh Mehta
2014-12-03 12:34:11 +05:30
parent eca7e22cda
commit 9f32a50379
3 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup.py
View File

@@ -1,10 +1,6 @@
from setuptools import setup, find_packages
<<<<<<< HEAD
version = "5.0.0-alpha"
=======
version = "4.12.0"
>>>>>>> upstream/develop
with open("requirements.txt", "r") as f:
install_requires = f.readlines()