Skip to content
Snippets Groups Projects
Commit b0a22783 authored by Florian Heck's avatar Florian Heck
Browse files

restored behavior of merge prior to 6219ae01

parent 194ed866
Hide whitespace changes
Inline Side-by-side
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