Skip to content

Commit e8ad014

Browse files
committed
removed additional video node
1 parent 3dd8e43 commit e8ad014

File tree

1 file changed

+0
-25
lines changed

1 file changed

+0
-25
lines changed

articles/expressroute/TOC.yml

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -226,11 +226,8 @@
226226
href: resiliency-validation.md
227227
- name: Security
228228
items:
229-
<<<<<<< HEAD
230-
=======
231229
- name: Secure your Expressroute
232230
href: secure-expressroute.md
233-
>>>>>>> f3db198ba89abe2ec14d679f84e0a2ddff4e520a
234231
- name: Security baseline
235232
href: /security/benchmark/azure/baselines/expressroute-security-baseline?toc=/azure/expressroute/TOC.json
236233
- name: Roles and permissions
@@ -352,27 +349,6 @@
352349
href: https://azure.microsoft.com/support/legal/sla/
353350
- name: ExpressRoute for Cloud Solution Providers (CSP)
354351
href: expressroute-for-cloud-solution-providers.md
355-
- name: Videos
356-
<<<<<<< HEAD
357-
href: https://azure.microsoft.com/documentation/videos/index/?services=expressroute
358-
items:
359-
- name: Connect a virtual network gateway to a circuit
360-
href: https://azure.microsoft.com/documentation/videos/azure-expressroute-how-to-create-a-connection-between-your-vpn-gateway-and-expressroute-circuit/
361-
- name: Create a virtual network for ExpressRoute
362-
href: https://azure.microsoft.com/documentation/videos/azure-expressroute-how-to-create-a-virtual-network/
363-
- name: Create a virtual network gateway for ExpressRoute
364-
href: https://azure.microsoft.com/documentation/videos/azure-expressroute-how-to-create-a-vpn-gateway-for-your-virtual-network/
365-
- name: Create an ExpressRoute circuit
366-
href: https://azure.microsoft.com/documentation/videos/azure-expressroute-how-to-create-an-expressroute-circuit/
367-
- name: Evolve your network infrastructure for connectivity
368-
href: /events/ignite-2015/brk2481
369-
- name: How to set up private peering for your circuit
370-
href: https://azure.microsoft.com/documentation/videos/azure-expressroute-how-to-set-up-azure-private-peering-for-your-expressroute-circuit/
371-
- name: "Hybrid partnerships: Enabling on-premises scenarios"
372-
href: /events/ignite-2015/brk1454
373-
- name: Set up Microsoft peering for your circuit
374-
href: https://azure.microsoft.com/documentation/videos/azure-expressroute-how-to-set-up-microsoft-peering-for-your-expressroute-circuit/
375-
=======
376352
items:
377353
- name: Videos
378354
href: /shows/Inside-Azure-for-IT/?products=azure-expressroute
@@ -382,7 +358,6 @@
382358
href: /events/ignite-2015/brk2481
383359
- name: 'Hybrid partnerships: Enabling on-premises scenarios'
384360
href: /events/ignite-2015/brk1454
385-
>>>>>>> f3db198ba89abe2ec14d679f84e0a2ddff4e520a
386361
- name: Classic and legacy articles
387362
items:
388363
- name: Modify a circuit

0 commit comments

Comments
 (0)