resolved conflicts

openconfig · Dec 18, 2024 · 5a152a7 · 5a152a7
1 parent a2e90a3
commit 5a152a7
Show file tree

Hide file tree

Showing 2 changed files with 1,111 additions and 1,112 deletions.
diff --git a/proto/metadata.proto b/proto/metadata.proto
@@ -666,7 +666,7 @@ message Metadata {
     bool isis_database_overloads_unsupported = 240;
     // verify_expected_breakout_supported_config is used to verify on Cisco devices if optic supports a given breakout mode
     // Cisco:
-    bool verify_expected_breakout_supported_config = 238;
+    bool verify_expected_breakout_supported_config = 241;
     // Reserved field numbers and identifiers.
     reserved 84, 9, 28, 20, 90, 97, 55, 89, 19, 36, 35, 40, 173;
   }