Merged PR 13714: clean up after merge conflict

This commit is contained in:
Jeanie Decker
2019-01-10 15:54:57 +00:00
parent 8a22f713d1
commit e9f6928dfa
2 changed files with 2 additions and 5 deletions

View File

@ -7,11 +7,6 @@ ms.sitesec: library
ms.pagetype: security
ms.localizationpriority: medium
author: jdeckerms
<<<<<<< HEAD
ms.date: 01/08/2019
=======
ms.date: 01/09/2019
>>>>>>> origin/master
---
# Configure kiosks and digital signs on Windows desktop editions