Skip to content
Snippets Groups Projects
Commit 9c2214f2 authored by Douwe Maan's avatar Douwe Maan
Browse files

Remove stray conflict marker

parent ef44138c
Branches
Tags
Pipeline #
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