Normalize whitespace and other merge details
This commit is contained in:
3
.gitattributes
vendored
3
.gitattributes
vendored
@@ -1,6 +1,5 @@
|
||||
/.travis.yml export-ignore
|
||||
/appveyor.yml export-ignore
|
||||
/ci export-ignore
|
||||
/.gitattributes export-ignore
|
||||
/.github export-ignore
|
||||
*.ppm binary
|
||||
/ChangeLog.md conflict-marker-size=8
|
||||
|
||||
Reference in New Issue
Block a user