Skip to content
Commit 1546e122 authored by Marc Cornellà's avatar Marc Cornellà
Browse files

Fix badly resolved rebase conflict

parent 4a9cd68e
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