From 323b32a97f9513036a5fd418ce54b43841420fb7 Mon Sep 17 00:00:00 2001 From: Dani Halfin Date: Tue, 23 Apr 2019 11:20:10 -0700 Subject: [PATCH] fixing some more conflicts --- .../threat-protection/windows-defender-atp/TOC.md | 9 --------- 1 file changed, 9 deletions(-) diff --git a/windows/security/threat-protection/windows-defender-atp/TOC.md b/windows/security/threat-protection/windows-defender-atp/TOC.md index f55255cb4e..d3ade96a48 100644 --- a/windows/security/threat-protection/windows-defender-atp/TOC.md +++ b/windows/security/threat-protection/windows-defender-atp/TOC.md @@ -351,10 +351,6 @@ #### [Configure managed security service provider (MSSP) support](configure-mssp-support-windows-defender-advanced-threat-protection.md) -<<<<<<< HEAD - -======= ->>>>>>> master ### Configure Microsoft Threat Protection integration #### [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) @@ -392,11 +388,6 @@ ##### [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) -<<<<<<< HEAD - -======= - ->>>>>>> master ## [Troubleshoot Windows Defender ATP](troubleshoot-wdatp.md) ###Troubleshoot sensor state