From 336608c7581dea04570a0c856a468f675598562f Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Wed, 21 Jun 2017 12:09:05 -0700 Subject: [PATCH] fixed merge conflict text2 --- windows/deployment/windows-10-poc-sc-config-mgr.md | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/windows/deployment/windows-10-poc-sc-config-mgr.md b/windows/deployment/windows-10-poc-sc-config-mgr.md index 4e36256cae..7cd077d90a 100644 --- a/windows/deployment/windows-10-poc-sc-config-mgr.md +++ b/windows/deployment/windows-10-poc-sc-config-mgr.md @@ -1,10 +1,11 @@ --- -title: Deploy Windows 10 using System Center Configuration Manager -description: Deploy Windows 10 in a test lab using System Center Configuration Manager +title: Step by step - Deploy Windows 10 using System Center Configuration Manager +description: Deploy Windows 10 in a test lab using System Center Configuration Manager ms.prod: w10 ms.mktglfcycl: deploy ms.sitesec: library -ms.pagetype: deploykeywords: deployment, automate, tools, configure, sccm, configuration manager +ms.pagetype: deploy +keywords: deployment, automate, tools, configure, sccm localizationpriority: high author: greg-lindsay --- @@ -14,6 +15,7 @@ author: greg-lindsay **Applies to** - Windows 10 + **Important**: This guide leverages the proof of concept (PoC) environment, and some settings that are configured in the following guides: - [Step by step guide: Deploy Windows 10 in a test lab](windows-10-poc.md) - [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md)