Skip to content
Snippets Groups Projects
Commit 8efd4cfd authored by Dirk Eichel's avatar Dirk Eichel
Browse files

fixed merge conflict

parent b3ebb717
Branches
Tags
Show whitespace changes
Inline Side-by-side
Showing
with 6 additions and 3 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment