Commit 2475dbbe authored by Alasdair Hunter's avatar Alasdair Hunter
Browse files

Revert "Solve merge conflict"

This reverts commit 44eff299, reversing
changes made to 1e7c7c17.
parent 44eff299
Supports Markdown
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