Skip to content
Snippets Groups Projects
Commit 5afd0e42 authored by Johannes Mey's avatar Johannes Mey
Browse files

fix merge error and autoformat

parent b8e169a0
No related branches found
No related tags found
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment