merge

Azure · Sep 9, 2020 · 676b2f6 · 676b2f6
1 parent 8577f7a
commit 676b2f6
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/...er/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json b/...er/Microsoft.Network/stable/2020-06-01/examples/VirtualRouterPeerListAdvertisedRoute.json
@@ -15,10 +15,7 @@
             "localAddress": "10.85.3.4",
             "network": "10.45.0.0/16",
             "nextHop": "10.85.3.4",
-<<<<<<< HEAD
             "sourcePeer": "10.85.3.4",
-=======
->>>>>>> f6f42c40b... Change name of operationid
             "origin": "Igp",
             "asPath": "65515",
             "weight": 0
@@ -27,10 +24,7 @@
             "localAddress": "10.85.3.4",
             "network": "10.85.0.0/16",
             "nextHop": "10.85.3.4",
-<<<<<<< HEAD
             "sourcePeer": "10.85.3.4",
-=======
->>>>>>> f6f42c40b... Change name of operationid
             "origin": "Igp",
             "asPath": "65515",
             "weight": 0
@@ -39,10 +33,7 @@
             "localAddress": "10.85.3.4",
             "network": "10.100.0.0/16",
             "nextHop": "10.85.3.4",
-<<<<<<< HEAD
             "sourcePeer": "10.85.3.4",
-=======
->>>>>>> f6f42c40b... Change name of operationid
             "origin": "Igp",
             "asPath": "65515",
             "weight": 0