From 891f9f4cf6afbd213d7260b880795af523646c11 Mon Sep 17 00:00:00 2001 From: Daan Date: Wed, 19 Mar 2025 20:38:19 -0700 Subject: [PATCH] fix conflict marker (issue #1038) --- SECURITY.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 0ad51aa0..b3c89efc 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -28,11 +28,7 @@ Please include the requested information listed below (as much as you can provid This information will help us triage your report more quickly. -<<<<<<< HEAD -If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/opensource/security/bounty) page for more details about our active programs. -======= If you are reporting for a bug bounty, more complete reports can contribute to a higher bounty award. Please visit our [Microsoft Bug Bounty Program](https://aka.ms/security.md/msrc/bounty) page for more details about our active programs. ->>>>>>> dev-slice ## Preferred Languages