Fix IndexError and line length issues in spotifycli.py for Python 3.13

Author: panpeacemaker

spotifycli/spotifycli.py

@@ -105,22 +105,13 @@ def start_shell():
             print("Error during call to fork()")
             exit(1)
 
-
 def add_arguments():
     parser = argparse.ArgumentParser(description=__doc__)
     for argument in get_arguments():
-<<<<<<< HEAD
-        arg_type = 'store' if len(argument) > 2 and argument[2] else 'store_true'
-        parser.add_argument(argument[0], help=argument[1], action=arg_type)
-    parser.add_argument("--client", action="store", dest="client",
-                        help="sets client's dbus name", default="spotify")
-    return parser.parse_args()
-=======
         if len(argument) > 2 and argument[2]:
             arg_type = 'store'
         else:
             arg_type = 'store_true'
->>>>>>> 3dcddf8 (Fix IndexError and line length issues in spotifycli.py for Python 3.13)
 
         parser.add_argument(
             argument[0],
@@ -138,6 +129,7 @@ def add_arguments():
 
     return parser.parse_args()
 
+
 def get_arguments():
     return [
         ("--version", "shows version number"),