Skip to content

Commit

Permalink
chore: fixup
Browse files Browse the repository at this point in the history
  • Loading branch information
moul committed Dec 24, 2019
1 parent b26e42a commit 3625834
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,13 @@
# Collapse vendored and generated files on GitHub
vendor/* linguist-vendored
rules.mk linguist-vendored
*/vendor/* linguist-vendored
vendor/* linguist-vendored
*.gen.* linguist-generated
*.pb.go linguist-generated
go.sum linguist-generated
go.mod linguist-generated
gen.sum linguist-generated
*/testdata/* linguist-generated
*/*/testdata/* linguist-generated

# Reduce conflicts on markdown files
*.md merge=union

0 comments on commit 3625834

Please sign in to comment.