Skip to content

master branch contains git conflict markers. #1038

@sbc100

Description

@sbc100

https://github.com/microsoft/mimalloc/compare/v2.2.2..e1123000

 git diff v2.2.2..origin/master
diff --git a/SECURITY.md b/SECURITY.md
index b3c89efc..0ad51aa0 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -28,7 +28,11 @@ 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

Metadata

Metadata

Assignees

No one assigned

    Labels

    No labels
    No labels

    Type

    No type
    No fields configured for issues without a type.

    Projects

    No projects

    Milestone

    No milestone

    Relationships

    None yet

    Development

    No branches or pull requests

    Issue actions