[Phpmyadmin-devel] Merging server pages

[Michal Čihař]

Hi

Dne Mon, 6 Jun 2011 14:23:06 +0200
Tyron Madlener <tyronx at gmail.com> napsal(a):

> Just got a merge conflict while trying to merge back from master and
> found some oddity. In your commit you removed the link to the binary
> log. Was that on purpose?

It's just moved as well, it's removed in one place and added further
in the code.

-- 
	Michal Čihař | http://cihar.com | http://blog.cihar.com
-------------- 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/20110606/7339b60a/attachment.sig>