Skip to content

Commit

Permalink
As shown by the current problems in merging, we do no longer use unio…
Browse files Browse the repository at this point in the history 
…n merge for the property files.
  • Loading branch information
@simonharrer
simonharrer committed Apr 14, 2016
1 parent 7bd97ef commit 8380fcf
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,3 @@ gradlew eol=lf
*.sh eol=lf

CHANGELOG.md merge=union
src/main/resources/l10n/*.properties merge=union

0 comments on commit 8380fcf

Please sign in to comment.