Fixed path in gitattributes file (#777)

This commit is contained in:
Sarah Maddox 2019-06-07 03:18:12 +10:00 committed by Kubernetes Prow Robot
parent ac69ccd679
commit 888d85127d
1 changed files with 2 additions and 2 deletions

4
.gitattributes vendored
View File

@ -1,3 +1,3 @@
# Ignore the resources files in diffs and merge conflicts
resources/ linguist-generated=true
resources/ -diff -merge
resources/** linguist-generated=true
resources/** -diff -merge