Skip to content

Commit 891f9f4

Browse files
committed
fix conflict marker (issue #1038)
1 parent e112300 commit 891f9f4

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

SECURITY.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,7 @@ Please include the requested information listed below (as much as you can provid
2828

2929
This information will help us triage your report more quickly.
3030

31-
<<<<<<< HEAD
32-
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.
33-
=======
3431
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.
35-
>>>>>>> dev-slice
3632

3733
## Preferred Languages
3834

0 commit comments

Comments
 (0)