diff options
| author | Matt Rendina <mrendina@stsci.edu> | 2017-05-24 14:45:44 -0400 |
|---|---|---|
| committer | Matt Rendina <mrendina@stsci.edu> | 2017-05-24 14:45:44 -0400 |
| commit | ee8cf0bc1c8449765ed67ca019e700161c356657 (patch) | |
| tree | 786c9d63bb7a2c92b9f3f47c4e1e84b1146eb7ff /setup.py | |
| parent | 2a4958e9e8389edc2b8e117e1d45635706bbec1b (diff) | |
| parent | 6b9eeaf9321223e15c37b53effe75118aed9ef5d (diff) | |
| download | rambo-ee8cf0bc1c8449765ed67ca019e700161c356657.tar.gz | |
merge
Diffstat (limited to 'setup.py')
| -rw-r--r-- | setup.py | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -23,6 +23,10 @@ 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 } ) |