mirror of
https://github.com/systemd/systemd.git
synced 2025-03-24 14:50:17 +03:00
chore: increase conflict marker size for .rst
This commit is contained in:
parent
0704f7bd14
commit
67d40dd144
1
.gitattributes
vendored
1
.gitattributes
vendored
@ -2,6 +2,7 @@
|
||||
*.gpg binary generated
|
||||
*.bmp binary
|
||||
*.base64 generated
|
||||
*.rst conflict-marker-size=100
|
||||
|
||||
# Mark files as "generated", i.e. no license applies to them.
|
||||
# This includes output from programs, directive lists generated by grepping
|
||||
|
Loading…
x
Reference in New Issue
Block a user