resolved merge conflict

This commit is contained in:
martyav
2019-08-19 12:38:47 -04:00
511 changed files with 24461 additions and 24844 deletions

File diff suppressed because it is too large Load Diff

View File

@ -67,7 +67,7 @@ This is an update to the [BitLocker CSP](https://docs.microsoft.com/windows/clie
This feature will soon be enabled on Olympia Corp as an optional feature.
#### Delivering BitLocker policy to AutoPilot devices during OOBE
#### Delivering BitLocker policy to AutoPilot devices during OOBE
You can choose which encryption algorithm to apply to BitLocker encryption capable devices, rather than automatically having those devices encrypt themselves with the default algorithm. This allows the encryption algorithm (and other BitLocker policies that must be applied prior to encryption), to be delivered before BitLocker encryption begins.