From e1a597f12631ace9aa355cf85b4c59ad43e552ab Mon Sep 17 00:00:00 2001 From: kktheballer Date: Mon, 3 Aug 2020 09:58:34 -0700 Subject: [PATCH] Rectifying error in previous commit (trailing characters taken out from common/schema/h) --- common/schema.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/common/schema.h b/common/schema.h index 78ee39655..2f20cfbb6 100644 --- a/common/schema.h +++ b/common/schema.h @@ -229,8 +229,6 @@ namespace swss { #define CFG_NAT_BINDINGS_TABLE_NAME "NAT_BINDINGS" #define CFG_NAT_GLOBAL_TABLE_NAME "NAT_GLOBAL" -<<<<<<< HEAD -======= #define CFG_STP_GLOBAL_TABLE_NAME "STP" #define CFG_STP_VLAN_TABLE_NAME "STP_VLAN" #define CFG_STP_VLAN_PORT_TABLE_NAME "STP_VLAN_PORT" @@ -238,7 +236,6 @@ namespace swss { #define CFG_RATES_TABLE_NAME "RATES" ->>>>>>> 8fce898... [schema] update schema with rates and utilization table names (#330) /***** STATE DATABASE *****/ #define STATE_SWITCH_CAPABILITY_TABLE_NAME "SWITCH_CAPABILITY_TABLE"