deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-19 00:37:22 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into jdsb

Browse Source
This commit is contained in:
Jeanie Decker 2019-01-10 06:54:19 -08:00
commit 345d655b15
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
windows/configuration/kiosk-methods.md
View File

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