itsscb/heapless
1
0
Fork 0
mirror of https://github.com/rust-embedded/heapless.git synced 2025-09-26 20:10:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

add merge=union to CHANGELOG.md to avoid merge conflicts.

Browse Source
This commit is contained in:
Dario Nieuwenhuis 2024-07-01 00:14:26 +02:00
parent 0cc439fe29
commit 67d9d11e57
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
CHANGELOG.md merge=union