Hi
Dne Sat, 28 Jan 2012 04:24:13 -0500
Marc Delisle <marc(a)infomarc.info> napsal(a):
I'm not sure what is happening between these
branches but please wait
before merging QA_3_5 into master until the situation is fixed.
The usual recipe of
git merge -X ours QA_3_5
does not seem to work.
Sorry it looks like I've messed up setup on translation server a bit,
what lead to merging master back to QA_3_5.
Michal,
I don't see such mess in my QA_3_5 after updating it.
--
Marc Delisle