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

fixing some more conflicts

Browse Source
This commit is contained in:
Dani Halfin
2019-04-23 11:20:10 -07:00
parent 95768abe55
commit 323b32a97f
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
windows/security/threat-protection/windows-defender-atp/TOC.md
View File

@ -351,10 +351,6 @@
#### [Configure managed security service provider (MSSP) support](configure-mssp-support-windows-defender-advanced-threat-protection.md) #### [Configure managed security service provider (MSSP) support](configure-mssp-support-windows-defender-advanced-threat-protection.md)
<<<<<<< HEAD
=======
>>>>>>> master
### Configure Microsoft Threat Protection integration ### Configure Microsoft Threat Protection integration
#### [Configure conditional access](configure-conditional-access-windows-defender-advanced-threat-protection.md) #### [Configure conditional access](configure-conditional-access-windows-defender-advanced-threat-protection.md)
#### [Configure Microsoft Cloud App Security in Windows](microsoft-cloud-app-security-config.md) #### [Configure Microsoft Cloud App Security in Windows](microsoft-cloud-app-security-config.md)
@ -392,11 +388,6 @@
##### [Offboarding machines](offboard-machines-windows-defender-advanced-threat-protection.md) ##### [Offboarding machines](offboard-machines-windows-defender-advanced-threat-protection.md)
#### [Configure Windows Security app time zone settings](time-settings-windows-defender-advanced-threat-protection.md) #### [Configure Windows Security app time zone settings](time-settings-windows-defender-advanced-threat-protection.md)
<<<<<<< HEAD
=======
>>>>>>> master
## [Troubleshoot Windows Defender ATP](troubleshoot-wdatp.md) ## [Troubleshoot Windows Defender ATP](troubleshoot-wdatp.md)
###Troubleshoot sensor state ###Troubleshoot sensor state