Skip to content

Commit

Permalink
New attempt with union merge... (JabRef#1719)
Browse files Browse the repository at this point in the history
  • Loading branch information
@oscargus @ayanai1
oscargus authored and ayanai1 committed Sep 5, 2016
1 parent bf0275c commit a2ebf4e
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ gradlew eol=lf
# ensure that line endings of *.java and *.properties are normalized
*.properties text
*.java text

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

0 comments on commit a2ebf4e

Please sign in to comment.