Skip to content
Snippets Groups Projects
Commit 1cbbb2a1 authored by Max Rüdiger's avatar Max Rüdiger
Browse files

resolve conflics

parents af496bfa 0b78e58d
No related branches found
No related tags found
1 merge request!104139 operator view
Pipeline #42835 passed with warnings
Stage: setup
Stage: test
Stage: report
This commit is part of merge request !104. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
Showing
with 180 additions and 72 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