Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 68a4cee50fac7c9e516c81853b0bbb8ecd713747 https://github.com/phpmyadmin/phpmyadmin/commit/68a4cee50fac7c9e516c81853b0b... Author: Marc Delisle <marc@infomarc.info> 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 <marc@infomarc.info>