Skip to content

Commit

Permalink
Enable auto merge of CHANGELOG.md (#10986)
Browse files Browse the repository at this point in the history
  • Loading branch information
@koppor
koppor authored Mar 7, 2024
1 parent 79ba1f0 commit 56c730d
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,4 @@ gradlew text eol=lf
*.java text eol=lf
*.properties text eol=lf

# disable after a release (otherwise, duplicate CHANGELOG.md entries will be generated)
# CHANGELOG.md merge=union
CHANGELOG.md merge=union

0 comments on commit 56c730d

Please sign in to comment.