Skip to content

Commit def5976

Browse files
fixing merge conflict TOC PR4
1 parent cc21915 commit def5976

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

articles/defender-for-cloud/release-notes-archive.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1383,10 +1383,7 @@ According to the [2021 State of the Cloud report](https://info.flexera.com/CM-RE
13831383

13841384
**Microsoft Defender for Cloud** is a Cloud Security Posture Management (CSPM) and cloud workload protection (CWP) solution that discovers weaknesses across your cloud configuration, helps strengthen the overall security posture of your environment, and protects workloads across multicloud and hybrid environments.
13851385

1386-
<<<<<<< HEAD
13871386
At Ignite 2019, we shared our vision to create the most complete approach for securing your digital estate and integrating XDR technologies under the Microsoft Defender brand. Unifying Azure Security Center and Azure Defender under the new name **Microsoft Defender for Cloud** reflects the integrated capabilities of our security offering and our ability to support any cloud platform.
1388-
=======
1389-
>>>>>>> ec3ba8f59ffea64e097dae0e97d54ec4dee1b010
13901387

13911388
### Native CSPM for AWS and threat protection for Amazon EKS, and AWS EC2
13921389

0 commit comments

Comments
 (0)