Skip to content
Snippets Groups Projects
Commit 09eff063 authored by Jan-Christoph Borchardt's avatar Jan-Christoph Borchardt
Browse files

fix merge conflict

parents c5bc3456 90ecd2c2
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 22 additions and 4 deletions
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