fixing merge conflicts

This commit is contained in:
Brian Lich
2016-06-02 15:39:11 -07:00
parent 5e5d121d83
commit 782f0f8f16
38 changed files with 0 additions and 152 deletions

View File

@ -2,12 +2,8 @@
title: Audit DPAPI Activity (Windows 10)
description: This topic for the IT professional describes the Advanced Security Audit policy setting, Audit DPAPI Activity, which determines whether the operating system generates audit events when encryption or decryption calls are made into the data protection application interface (DPAPI).
ms.assetid: be4d4c83-c857-4e3d-a84e-8bcc3f2c99cd
<<<<<<< HEAD
ms.prod: w10
=======
ms.pagetype: security
ms.prod: W10
>>>>>>> secaudit
ms.mktglfcycl: deploy
ms.sitesec: library
author: Mir0sh