Skip to content

Commit

Permalink
Reduces CHANGELOG merge conflicts by always relying on the union merg…
Browse files Browse the repository at this point in the history 
…e option
  • Loading branch information
@simonharrer
simonharrer committed Sep 29, 2015
1 parent 05a30ed commit 3c27e6b
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
gradlew eol=lf
*.sh eol=lf

CHANGELOG merge=union

0 comments on commit 3c27e6b

Please sign in to comment.