digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 17:28:46 +03:00
Code Issues Projects Releases Wiki Activity
2d52406199
daml/.gitattributes

4 lines
61 B
Plaintext
Raw Normal View History

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 18:29:13 +03:00
unreleased.rst merge=union
open-sourcing daml
2019-04-04 11:33:38 +03:00
*.daml linguist-language=Haskell
Reference in New Issue Copy Permalink