Rectifying error in previous commit

(trailing characters taken out from common/schema/h)
kktheballer · Dec 20, 2020 · e1a597f · e1a597f
1 parent 64611a7
commit e1a597f
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/common/schema.h b/common/schema.h
@@ -229,16 +229,13 @@ 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"
 #define CFG_STP_PORT_TABLE_NAME                     "STP_PORT"
 
 #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"