[Phpmyadmin-devel] Merging server pages

[Tyron Madlener]

On Mon, Jun 6, 2011 at 2:25 PM, Michal Čihař <michal at cihar.com> wrote:
> 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.
>

Oh, right. Must've overlooked that.

> --
>        Michal Čihař | http://cihar.com | http://blog.cihar.com
>
> ------------------------------------------------------------------------------
> Simplify data backup and recovery for your virtual environment with vRanger.
> Installation's a snap, and flexible recovery options mean your data is safe,
> secure and there when you need it. Discover what all the cheering's about.
> Get your free trial download today.
> http://p.sf.net/sfu/quest-dev2dev2
> _______________________________________________
> Phpmyadmin-devel mailing list
> Phpmyadmin-devel at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/phpmyadmin-devel
>
>