From e5066aff9505e46a5d2558c82bd04d807eba7bc1 Mon Sep 17 00:00:00 2001 From: Sangita Maity Date: Tue, 2 Jun 2020 20:46:05 +0000 Subject: [PATCH] Fix merge conflict due to multi-asic support Signed-off-by: Sangita Maity --- src/sonic-config-engine/sonic-cfggen | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/sonic-config-engine/sonic-cfggen b/src/sonic-config-engine/sonic-cfggen index f463d9b901c5..afaf3b1c2058 100755 --- a/src/sonic-config-engine/sonic-cfggen +++ b/src/sonic-config-engine/sonic-cfggen @@ -37,12 +37,8 @@ from functools import partial from minigraph import minigraph_encoder from minigraph import parse_xml from minigraph import parse_device_desc_xml -<<<<<<< HEAD from minigraph import parse_asic_sub_role -from portconfig import get_port_config -======= from portconfig import get_port_config, get_port_config_file_name, get_breakout_mode ->>>>>>> [buildImage] Add support of platform.json parsing to portconfig.py file from sonic_device_util import get_machine_info from sonic_device_util import get_platform_info from sonic_device_util import get_system_mac