Skip to content
Snippets Groups Projects
Commit b597c677 authored by Manuel Kieweg's avatar Manuel Kieweg
Browse files

resolve merge conflicts

parents 2069c54a 50722ba9
Branches
Tags
Checking pipeline status
This commit is part of merge request !155. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment