Linting

ktbyers · ktbyers · commit 8af0f26b1a90 · 2025-02-19T17:06:23.000-08:00
diff --git a/netmiko/cisco/cisco_ap_ssh.py b/netmiko/cisco/cisco_ap_ssh.py
@@ -1,4 +1,5 @@
 """Subclass specific to Cisco AP."""
+
 from netmiko.no_config import NoConfig
 from netmiko.cisco_base_connection import CiscoBaseConnection
 
diff --git a/netmiko/ssh_dispatcher.py b/netmiko/ssh_dispatcher.py
@@ -193,12 +193,9 @@
     "cdot_cros": CdotCrosSSH,
     "centec_os": CentecOSSSH,
     "ciena_saos": CienaSaosSSH,
-    "cisco_asa": CiscoAsaSSH,
-<<<<<<< HEAD
-    "cisco_apic": CiscoApicSSH,
-=======
     "cisco_ap": CiscoApSSH,
->>>>>>> 57a209a8d1f475a612d9b2190cea75b5cb0891ac
+    "cisco_apic": CiscoApicSSH,
+    "cisco_asa": CiscoAsaSSH,
     "cisco_ftd": CiscoFtdSSH,
     "cisco_ios": CiscoIosSSH,
     "cisco_nxos": CiscoNxosSSH,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`"""Subclass specific to Cisco AP."""`
	`2`	`+`
`2`	`3`	`from netmiko.no_config import NoConfig`
`3`	`4`	`from netmiko.cisco_base_connection import CiscoBaseConnection`
`4`	`5`