Skip to content
Commit b5b2f4af authored by Sergio Martins's avatar Sergio Martins
Browse files

Fix the previous merge conflict correctly.

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