1 files changed, 4 insertions, 0 deletions
diff --git a/setup.py b/setup.py
index 454329f..72b6571 100644
--- a/setup.py
+++ b/setup.py
@@ -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
     }
 )