Skip to content
Snippets Groups Projects
Commit 97b13614 authored by Markus Holzer's avatar Markus Holzer
Browse files

Fix merge conflics

parents 6ad3bff9 157c4f11
This commit is part of merge request !268. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 205 additions and 103 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