The TS-GitLab will have to shut down towards the end of the year — please think about migrating your projects to or GitHub.
(This is still a very early message, meant to keep you informed. There will be more urgent ones in the future.)

Commit 78133fb6 authored by Lukas Riedel's avatar Lukas Riedel 🎧
Browse files

Merge branch 'att-gitattributes-for-changelog-1' into 'master'

Add .gitattributes file with merge strategy for

See merge request !66
parents 00f5e36e bacf7bf6 merge=union
\ No newline at end of file
......@@ -7,6 +7,8 @@
* Automatic deployment of `devel` and stable DORiE Docker Images to Docker Hub
* Automatic update of the DUNE environment Docker Image for `master` builds
* CI pipeline now also compiles a Debug build with the LLVM Clang compiler
* Add `.gitattributes` for `` to reduce merge conflicts with
### Changed
* Update code base to DUNE v2.6
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment