Fix for sample data

sonic-net · Mar 5, 2025 · f7e11e2 · f7e11e2
1 parent fec860e
commit f7e11e2
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/sonic-yang-models/tests/files/sample_config_db.json b/src/sonic-yang-models/tests/files/sample_config_db.json
@@ -2339,7 +2339,10 @@
         },
         "VNET_ROUTE_TUNNEL" : {
             "vnet1|10.0.0.0/24" : {
+<<<<<<< HEAD
                 "name":"vnet1|10.0.0.0/24",
+=======
+>>>>>>> c1960504e (Fix for sample data)
                 "endpoint": "192.168.1.2",
                 "mac_address": "F9:22:83:99:22:A2",
                 "vxlanid": "10011"