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

fix wrong conflict resolution

parent d273b55e
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