Skip to content
Snippets Groups Projects
Commit 7aa26b4b authored by Martin Teichmann's avatar Martin Teichmann
Browse files

union merge changelog 

the changelog should just collect all added lines, no conflict resolution
necessary
parent 73c06285
No related branches found
No related tags found
1 merge request!164Provide a changelog in the documentation
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 0 deletions
.gitattributes 0 → 100644
+ 1
− 0
View file @ 7aa26b4b
doc/changelog.rst merge=union
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

Legal Notice | Contacts