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

merge conflict

Browse Source
This commit is contained in:
Daniel Simpson 2022-05-03 16:06:47 -07:00
parent 15605479b8
commit 44295bbcb2
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
windows/security/information-protection/bitlocker/bitlocker-basic-deployment.md
View File

@ -114,11 +114,7 @@ The following table shows the compatibility matrix for systems that have been Bi
Table 1: Cross compatibility for Windows 11, Windows 10, Windows 8.1, Windows 8, and Windows 7 encrypted volumes
<<<<<<< v-smandalika-blmgep-4318240
|Encryption Type|Windows 10 and Windows 8.1|Windows 8|Windows 7|
=======
|Encryption Type|Windows 11, Windows 10, and Windows 8.1|Windows 8|Windows 7|
>>>>>>> main
|--- |--- |--- |--- |
|Fully encrypted on Windows 8|Presents as fully encrypted|N/A|Presented as fully encrypted|
|Used Disk Space Only encrypted on Windows 8|Presents as encrypt on write|N/A|Presented as fully encrypted|