Update setup.py

10 years ago · 0f2b7bd2bf
1 changed files with 0 additions and 4 deletions
--- a/setup.py
+++ b/setup.py
@ -1,10 +1,6 @@
 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()