Skip to content
Commit c9270e8c authored by Luís Oliveira's avatar Luís Oliveira
Browse files

Fix some conflicts. 

Note to self: do not use darcs amend-record with someone else's patch. Doh.
parent 38570f3b
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