daml/.gitattributes
Stefano Baghino 2a29ddb3d0 Follow up with .gitattributes on #1762 (#1770)
The unreleased features are now listed in `unreleased.rst` as a separate
file rather then going to the release notes themselves. This
contribution adjusts .gitattributes accordingly to define the automatic
merge strategy for this file.
2019-06-19 15:29:13 +00:00

4 lines
61 B
Plaintext

unreleased.rst merge=union
*.daml linguist-language=Haskell