fixed merge conflicts from private repo

This commit is contained in:
Liza Poggemeyer
2019-08-09 14:48:50 -07:00
691 changed files with 52440 additions and 52369 deletions

View File

@ -11,6 +11,7 @@ ms.mktglfcycl: deploy
ms.localizationpriority: medium
ms.pagetype: mdt
ms.sitesec: library
audience: itpro
author: greg-lindsay
ms.topic: article
---
@ -92,7 +93,7 @@ Figure 20. The result from the MDT Sample web service.
After verifying the web service using Internet Explorer, you are ready to do the same test in the MDT simulation environment.
1. On PC0001, edit the CustomSettings.ini file in the **C:\\MDT** folder to look like the following:
```ini
```
[Settings]
Priority=Default, GetComputerName
[Default]
@ -108,7 +109,7 @@ After verifying the web service using Internet Explorer, you are ready to do the
2. Save the CustomSettings.ini file.
3. Using an elevated Windows PowerShell prompt (run as Administrator), run the following commands. Press **Enter** after each command:
```powershell
```
Set-Location C:\MDT
.\Gather.ps1
```