resolved conflict the wrong way
This commit is contained in:
parent
4206539aed
commit
e6ae2ad634
1 changed files with 1 additions and 2 deletions
3
setup.py
3
setup.py
|
@ -12,8 +12,7 @@ try:
|
|||
except ImportError:
|
||||
pass
|
||||
|
||||
long_description = open(os.path.join(os.path.dirname(__file__),
|
||||
'README.rst')).read()
|
||||
long_description = open('README.rst').read()
|
||||
|
||||
setup(name="oyster",
|
||||
version='0.3.2',
|
||||
|
|
Loading…
Reference in a new issue