Update setup.py

allmightyspiff · GitHub Enterprise · commit 1ba7da6b2ee4 · 2023-03-16T14:49:09.000-05:00
fixed merge conflict
diff --git a/setup.py b/setup.py
@@ -15,7 +15,6 @@
     LONG_DESCRIPTION = DESCRIPTION
 
 setup(
-<<<<<<< HEAD
     name='SoftLayer-Internal',
     version='6.1.3',
     description=DESCRIPTION,
