Commit 78133fb6 authored by Lukas Riedel's avatar Lukas Riedel

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

Add .gitattributes file with merge strategy for CHANGELOG.md

See merge request !66
parents 00f5e36e bacf7bf6
CHANGELOG.md 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 `CHANGELOG.md` to reduce merge conflicts with
`merge=union`
### 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