Fix qmk cli isues'

lib/python/qmk/cli/doctor/linux.py

@@ -54,10 +54,7 @@ def check_udev_rules():
             _udev_rule("03eb", "2ff3"),  # ATmega16U4
             _udev_rule("03eb", "2ff4"),  # ATmega32U4
             _udev_rule("03eb", "2ff9"),  # AT90USB64
-<<<<<<< HEAD
-=======
             _udev_rule("03eb", "2ffa"),  # AT90USB162
->>>>>>> 0.12.52~1
             _udev_rule("03eb", "2ffb")  # AT90USB128
         },
         'kiibohd': {_udev_rule("1c11", "b007")},
@@ -108,11 +105,7 @@ def check_udev_rules():
 
         # Collect all rules from the config files
         for rule_file in udev_rules:
-<<<<<<< HEAD
-            for line in rule_file.read_text().split('\n'):
-=======
             for line in rule_file.read_text(encoding='utf-8').split('\n'):
->>>>>>> 0.12.52~1
                 line = line.strip()
                 if not line.startswith("#") and len(line):
                     current_rules.add(line)
@@ -149,11 +142,7 @@ def check_modem_manager():
 
     """
     if check_systemd():
-<<<<<<< HEAD
-        mm_check = run(["systemctl", "--quiet", "is-active", "ModemManager.service"], timeout=10)
-=======
         mm_check = cli.run(["systemctl", "--quiet", "is-active", "ModemManager.service"], timeout=10)
->>>>>>> 0.12.52~1
         if mm_check.returncode == 0:
             return True
     else: