Skip to content
Commit 7f46a9f6 authored by Dominika Zemanovičová's avatar Dominika Zemanovičová
Browse files

Fix merge errors M2-user merge

parent edb79d88
Pipeline #215699 passed with stages
in 4 minutes and 26 seconds
Hide whitespace changes
Inline Side-by-side
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