resolved conflict the wrong way

This commit is contained in:
James Turk 2012-05-10 11:16:35 -04:00
parent 4206539aed
commit e6ae2ad634

View File

@ -12,8 +12,7 @@ try:
except ImportError: except ImportError:
pass pass
long_description = open(os.path.join(os.path.dirname(__file__), long_description = open('README.rst').read()
'README.rst')).read()
setup(name="oyster", setup(name="oyster",
version='0.3.2', version='0.3.2',