Skip to content
Commit 5705d05d authored by Harald Sitter's avatar Harald Sitter 🐧
Browse files

drop conflict markers introduced by recent merge 

CCMAIL: 1241604@bugs.launchpad.net
parent 7c596a55
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