diff --git a/.gitattributes b/.gitattributes index 33c8a2834e..2895757e05 100644 --- a/.gitattributes +++ b/.gitattributes @@ -16,4 +16,3 @@ /Documentation/gitk.txt conflict-marker-size=32 /Documentation/user-manual.txt conflict-marker-size=32 /t/t????-*.sh conflict-marker-size=32 -/t/oid-info/* eol=lf