update test registry

openconfig · Oct 31, 2024 · 5b79a25 · 5b79a25
1 parent b472d25
commit 5b79a25
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/testregistry.textproto b/testregistry.textproto
@@ -169,7 +169,7 @@ test: {
 }
 test: {
   id: "CPT-1.1"
-  description: "ARP Policer"
+  description: "Ingress Interface ARP Policer"
   readme: ""
   exec: " "
 }
@@ -282,13 +282,13 @@ test: {
   exec: " "
 }
 test: {
-<<<<<<< HEAD
   id: "DP-2.2"
-=======
-  id: "DP-2.4"
->>>>>>> main
   readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/qos/otg_tests/ingress_police_nhg/README.md"
 }
+test: {
+  id: "DP-2.4"
+  readme: "https://github.com/openconfig/featureprofiles/blob/main/feature/qos/otg_tests/ingress_police_default/README.md"
+}
 test: {
   id: "FP-1.1"
   description: "Power admin DOWN/UP Test"