kiper220/mimalloc
1
0
Fork 0
mirror of https://github.com/microsoft/mimalloc.git synced 2025-05-03 05:59:31 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix conflict marker (issue #1038)

Browse source
This commit is contained in:
Daan 2025-03-19 20:38:19 -07:00
parent e112300059
commit 891f9f4cf6
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SECURITY.md
View file

@ -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