Skip to content
Snippets Groups Projects
Commit c2e1c82d authored by Christian Weber's avatar Christian Weber
Browse files

Remove residual merge conflict markers

parent c6a7e55f
No related branches found
No related tags found
Checking pipeline status
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