[Phpmyadmin-devel] about QA_3_5 and master

[Michal Čihař]

Hi

Dne Sat, 28 Jan 2012 04:24:13 -0500
Marc Delisle <marc at 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 Čihař | http://cihar.com | http://phpmyadmin.cz
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: not available
URL: <http://lists.phpmyadmin.net/pipermail/developers/attachments/20120131/63e26d55/attachment.sig>