Commit c1a92736 authored by Ate Douma's avatar Ate Douma

HIPPLUG-1200 merge master in translations-psp1 branch ignoring master (-s ours)

Earlier 'merge points' in svn turned out to be not properly recorded/migrated
to Git, so for Git nothing had been merged so far.
To remedy this, an empty merge (merge strategy -s ours) from master (16986994)
is added joining the two trees again 'as if'.
parents 427c7fd9 16986994
Markdown is supported
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