fixed merge conflict from main

This commit is contained in:
Petr Klima committed 2020-11-18 12:10:20 +01:00
commit bdfbf8ba26
1 file changed
+2 -1
+2 -1
View File
@@ -516,6 +516,7 @@ class S350Driver(NetworkDriver):
neighbors = {}
output = self._send_command('show lldp neighbors')
<<<<<<< HEAD
header = True # cycle trought header
local_port = '' # keep previous context - multiline syname
remote_port = ''
@@ -549,7 +550,7 @@ class S350Driver(NetworkDriver):
}
neighbor_list = [neighbor, ]
neighbors[local_port] = neighbor_list
return neighbors
def _get_lldp_neighbors_line_to_fields(self, line, fields_end):