[warmboot] fix merge conflicts

dzhangalibaba · dzhangalibaba · commit 617781f99066 · 2020-08-12T11:28:59.000-07:00
diff --git a/config/main.py b/config/main.py
@@ -52,14 +52,10 @@
 CFG_LOOPBACK_ID_MAX_VAL = 999
 CFG_LOOPBACK_NO="<0-999>"
 
-<<<<<<< HEAD
 MAXIMUM_WARMRESTART_TIMER_VALUE = 9999
 
 asic_type = None
 config_db = None
-=======
-DISABLE_WARMRESTART_TIMER_VALUE = 9999
->>>>>>> [warmboot] using disable keyword to set timer
 # ========================== Syslog wrappers ==========================
 
 def log_debug(msg):
