fixing conflicts

This commit is contained in:
Dani Halfin
2019-06-06 15:09:32 -07:00
337 changed files with 499 additions and 486 deletions

View File

@ -29,7 +29,7 @@ To let people in your organization sign in to Surface Hub with their phones and
![multi-factor authentication options](images/mfa-options.png)
- Enable content hosting on Azure AD services such as Office online, SharePoint, etc.
- Enable content hosting on Azure AD services such as Office, SharePoint, etc.
- Surface Hub must be running Windows 10, version 1703 or later.