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

Fix Conflict and Fix Table Layout

Browse Source 
What's new in Windows 10, version 1803
This commit is contained in:
新宅 伸啓 2018-03-30 00:28:28 +09:00 committed by GitHub
parent 4675781707
commit bcf34f4ca4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md
View File

@ -1329,16 +1329,20 @@ For details about Microsoft mobile device management protocols for Windows 10 s
</ul> </ul>
</td></tr> </td></tr>
<tr> <tr>
<<<<<<< HEAD </ul>
</td></tr>
<tr>
<td style="vertical-align:top">[AccountManagement CSP](accountmanagement-csp.md)</td> <td style="vertical-align:top">[AccountManagement CSP](accountmanagement-csp.md)</td>
<td style="vertical-align:top"><p>Added a new CSP in Windows 10, version 1803.</p> <td style="vertical-align:top"><p>Added a new CSP in Windows 10, version 1803.</p>
======= </ul>
</td></tr>
<tr>
<td style="vertical-align:top">[RootCATrustedCertificates CSP](rootcacertificates-csp.md)</td> <td style="vertical-align:top">[RootCATrustedCertificates CSP](rootcacertificates-csp.md)</td>
<td style="vertical-align:top"><p>Added the following node in Windows 10, version 1803:</p> <td style="vertical-align:top"><p>Added the following node in Windows 10, version 1803:</p>
<ul> <ul>
<li>UntrustedCertificates</li> <li>UntrustedCertificates</li>
</ul> </ul>
>>>>>>> 2aa0839b99c52229c7cf43d58f467019b1284a6a
</td></tr> </td></tr>
</tbody> </tbody>
</table> </table>