Skip to content
Snippets Groups Projects
Commit 71f29969 authored by Mark Wielaard's avatar Mark Wielaard
Browse files

Remove conflict markers that I commited by mistake 

From-SVN: r40605
parent 082a12bc
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 0 additions and 14 deletions
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