mirror of
https://github.com/mikaela/mikaela.github.io/
synced 2024-12-25 04:32:43 +01:00
txt/.gitattributes: use merge strategy union for obtainium.txt should I merge conflict it at this rate
This commit is contained in:
parent
5b33539005
commit
d3f9e62664
1
txt/.gitattributes
vendored
Normal file
1
txt/.gitattributes
vendored
Normal file
@ -0,0 +1 @@
|
||||
obtainium.txt text eol=lf merge=union
|
Loading…
Reference in New Issue
Block a user