Cherry-pick was not clean. Fixing it.

Signed-off-by: Abhishek Dosi <abdosi@microsoft.com>
2020-07-08 13:58:42 -07:00 · 2020-07-08 13:58:42 -07:00 · 251dc0a21e
commit 251dc0a21e
parent b3720bc082
1 changed files with 0 additions and 1 deletions
--- a/src/sonic-config-engine/sonic_device_util.py
+++ b/src/sonic-config-engine/sonic_device_util.py
@ -44,7 +44,6 @@ def get_npu_id_from_name(npu_name):
    else:
        return None

-<<<<<<< HEAD
 def get_npu_device_id(npu_id):
    platform = get_platform_info(get_machine_info())
    if not platform: