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

fixed conflict

Browse Source
This commit is contained in:
Nabin Hait
2015-04-21 17:16:28 +05:30
parent 7337c80f09 3b8682f534
commit b650d691a0
27 changed files with 145 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
setup.py
View File

@@ -1,6 +1,10 @@
from setuptools import setup, find_packages
<<<<<<< HEAD
version = "5.0.0-beta"
=======
version = "4.25.1"
>>>>>>> 3b8682f534f12bd72e52685d1286a2cc72713857
with open("requirements.txt", "r") as f:
install_requires = f.readlines()