From 4ab8f100f792a4cc39fe899e6bf7d2a62c056b0d Mon Sep 17 00:00:00 2001
From: Matt Rendina <mrendina@stsci.edu>
Date: Wed, 24 May 2017 14:48:08 -0400
Subject: Remove conflicted lines

---
 setup.py | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/setup.py b/setup.py
index 72b6571..24b3fc8 100644
--- a/setup.py
+++ b/setup.py
@@ -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
     }
 )
-- 
cgit