Skip to content

Commit c347bb8

Browse files
committed
fix
1 parent 33ef713 commit c347bb8

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

articles/expressroute/TOC.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,6 @@
327327
displayName: ARM,resource manager template
328328
- name: Resources
329329
items:
330-
<<<<<<< HEAD
331330
- name: Configure a router for ExpressRoute
332331
items:
333332
- name: Configure a router
@@ -351,8 +350,9 @@
351350
- name: ExpressRoute for Cloud Solution Providers (CSP)
352351
href: expressroute-for-cloud-solution-providers.md
353352
- name: Videos
354-
href: /shows/Inside-Azure-for-IT/?products=azure-expressroute
355353
items:
354+
- name: Videos
355+
href: /shows/Inside-Azure-for-IT/?products=azure-expressroute
356356
- name: Microsoft Azure hybrid connectivity overview
357357
href: /shows/inside-azure-for-it/microsoft-azure-hybrid-connectivity-overview
358358
- name: Evolve your network infrastructure for connectivity

0 commit comments

Comments
 (0)