Polishing

microsoft · Dec 23, 2024 · 8aed16c · 8aed16c
1 parent 853c0e7
commit 8aed16c
Showing 1 changed file with 0 additions and 19 deletions.
diff --git a/pkg/utils/attr_utils.go b/pkg/utils/attr_utils.go
@@ -34,7 +34,6 @@ var (
 	remoteNodeKey      = attribute.Key("remote_node")
 
 	// todo move to attributes pkg?
-<<<<<<< HEAD
 	Type           = "type"
 	Reason         = "reason"
 	Direction      = "direction"
@@ -51,24 +50,6 @@ var (
 	Active         = "ACTIVE"
 	Device         = "device"
 	Uninitialized  = "uninitialized"
-=======
-	Type                  = "type"
-	Reason                = "reason"
-	Direction             = "direction"
-	SourceNodeName        = "source_node_name"
-	TargetNodeName        = "target_node_name"
-	State                 = "state"
-	Address               = "address"
-	Port                  = "port"
-	StatName              = "statistic_name"
-	InterfaceName         = "interface_name"
-	InterfaceNameConstant = "all_interfaces"
-	Flag                  = "flag"
-	Endpoint              = "endpoint"
-	AclRule               = "aclrule"
-	Active                = "ACTIVE"
-	Device                = "device"
->>>>>>> main
 
 	// TCP Connection Statistic Names
 	ResetCount           = "ResetCount"