fix conflicts

This commit is contained in:
Greg Lindsay
2019-06-17 15:12:33 -07:00
155 changed files with 516 additions and 558 deletions

View File

@ -4,12 +4,11 @@ description: Custom XML Examples
ms.assetid: 48f441d9-6c66-43ef-91e9-7c78cde6fcc0
ms.reviewer:
manager: laurawi
ms.author: lomayor
ms.author: greglin
ms.prod: w10
ms.mktglfcycl: deploy
ms.sitesec: library
author: lomayor
ms.date: 04/19/2017
author: greg-lindsay
ms.topic: article
---