[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 68a4ce: Fix merge conflict

26 Apr 2014

  Branch: refs/heads/master
  Home:   https://github.com/phpmyadmin/phpmyadmin
  Commit: 68a4cee50fac7c9e516c81853b0bbb8ecd713747
     
https://github.com/phpmyadmin/phpmyadmin/commit/68a4cee50fac7c9e516c81853b0…
  Author: Marc Delisle &lt;marc(a)infomarc.info&gt;
  Date:   2014-04-26 (Sat, 26 Apr 2014)

  Changed paths:
    M libraries/tbl_columns_definition_form.lib.php

  Log Message:
  -----------
  Fix merge conflict

Signed-off-by: Marc Delisle &lt;marc(a)infomarc.info&gt;

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

[Phpmyadmin-git] [phpmyadmin/phpmyadmin] 68a4ce: Fix merge conflict