3 Commits

Author	SHA1	Message	Date
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
Martin Huschenbett	168191875d	Merge conflicting release-notes.rst changes automatically (#893) ... ... by keeping both entries.	2019-05-03 17:15:18 +02:00
Digital Asset GmbH	05e691f558	open-sourcing daml	2019-04-04 09:33:38 +01:00