resolve merge conflict

This commit is contained in:
Aaron Czechowski
2023-05-16 16:26:38 -07:00
144 changed files with 2833 additions and 603 deletions

View File

@ -53,7 +53,7 @@ To use federated sign-in, the devices must have Internet access. This feature do
> - Provisioning packages (PPKG)
> - Windows Autopilot self-deploying mode
### System requirements
[!INCLUDE [federated-sign-in](../../includes/licensing/federated-sign-in.md)]
Federated sign-in for student assigned (1:1) devices is supported on the following Windows editions and versions: