From 1face1ed8ccafdd3128c774653d7e99545c6ce61 Mon Sep 17 00:00:00 2001 From: Preetham Singh Date: Tue, 26 Jul 2022 03:03:37 -0700 Subject: [PATCH] Fixing rebase merge conflicts --- scripts/intfutil | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/intfutil b/scripts/intfutil index 9b9ddfaf04..e327d1a607 100755 --- a/scripts/intfutil +++ b/scripts/intfutil @@ -381,7 +381,6 @@ def appl_db_sub_intf_status_get(appl_db, config_db, front_panel_ports_list, port if sub_intf_sep_idx != -1: parent_port_name = get_intf_longname(sub_intf_name[:sub_intf_sep_idx]) - full_intf_table_name = "INTF_TABLE" + ":" + sub_intf_name if status_type == "vlan":