Skip to content
Snippets Groups Projects
Commit f633fb53 authored by Morris Jobke's avatar Morris Jobke
Browse files

fix wrong conflict resolution

parent d273b55e
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 1 addition and 1 deletion
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment