diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-05-24 14:48:08 -0400 |
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-05-24 14:48:08 -0400 |
| commit | 4ab8f100f792a4cc39fe899e6bf7d2a62c056b0d (patch) | |
| tree | fbdb46380ff4f5154f6b43d0866fad1ba6fcca23 /setup.py | |
| parent | ee8cf0bc1c8449765ed67ca019e700161c356657 (diff) | |
| download | rambo-4ab8f100f792a4cc39fe899e6bf7d2a62c056b0d.tar.gz | |
Remove conflicted lines
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 6 |
1 files changed, 1 insertions, 5 deletions
@@ -3,7 +3,7 @@ from setuptools import setup, find_packages version = {} with open("rambo/_version.py") as fp: exec(fp.read(), version) - # later on use: version['__version__'] + # use: version['__version__'] to access setup( name='rambo', @@ -23,10 +23,6 @@ setup( packages=find_packages(), package_data={'': ['README.md', 'LICENSE.txt']}, entry_points = { -<<<<<<< HEAD 'console_scripts': ['rambo=rambo.__main__:main'], -======= - 'console_scripts': ['rambo=rambo.rambo:main'], ->>>>>>> 6b9eeaf9321223e15c37b53effe75118aed9ef5d } ) |