daml/.gitattributes
Martin Huschenbett 168191875d
Merge conflicting release-notes.rst changes automatically (#893)
... by keeping both entries.
2019-05-03 17:15:18 +02:00

4 lines
84 B
Plaintext

docs/source/support/release-notes.rst merge=union
*.daml linguist-language=Haskell