Mikaela
/
mikaela.github.io
mirror of https://github.com/mikaela/mikaela.github.io/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

txt/.gitattributes: use merge strategy union for obtainium.txt should I merge conflict it at this rate

This commit is contained in:
Aminda Suomalainen 2024-02-26 08:19:51 +02:00
parent 5b33539005
commit d3f9e62664
Signed by: Mikaela
SSH Key Fingerprint: SHA256:CXLULpqNBdUKB6E6fLA1b/4SzG0HvKD19PbIePU175Q
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
txt/.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
obtainium.txt text eol=lf merge=union