Skip to content

Commit efb5292

Browse files
committed
Fix previous commit
1 parent c5a688b commit efb5292

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
@@ -1,10 +1,6 @@
11
from setuptools import setup
22

3-
<<<<<<< HEAD
4-
__version__ = '2.1.3'
5-
=======
63
__version__ = '3.0.0a1'
7-
>>>>>>> multiclients
84

95
with open('README.md', encoding='utf-8') as f:
106
long_description = f.read()

0 commit comments

Comments
 (0)