Skip to content

Commit 1613329

Browse files
committed
Fix bad merge conflict resolution
1 parent ac3aaa6 commit 1613329

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

setup.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -222,11 +222,7 @@ def finalize_options(self):
222222
author_email="[email protected]",
223223
license="MIT",
224224
url="https://github.com/symengine/symengine.py",
225-
<<<<<<< HEAD
226225
python_requires='>=3.6.*,<4',
227-
=======
228-
python_requires='!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,<4',
229-
>>>>>>> 916b786... Remove support for python 2 and 3.5
230226
zip_safe=False,
231227
cmdclass = cmdclass,
232228
classifiers=[

0 commit comments

Comments
 (0)