resolved conflict the wrong way

2012-05-10 11:16:35 -04:00 · 2012-05-10 11:16:35 -04:00 · e6ae2ad634
commit e6ae2ad634
parent 4206539aed
1 changed files with 1 additions and 2 deletions
--- a/setup.py
+++ b/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',