Skip to content

Commit

Permalink
Merge conflicting release-notes.rst changes automatically (digital-as…
Browse files Browse the repository at this point in the history
…set#893)

... by keeping both entries.
  • Loading branch information
hurryabit authored May 3, 2019
1 parent e8261f2 commit 1681918
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
@@ -1,4 +1,3 @@
CHANGELOG.md merge=union
UNRELEASED.md merge=union
docs/source/support/release-notes.rst merge=union

*.daml linguist-language=Haskell

0 comments on commit 1681918

Please sign in to comment.