Branch: refs/heads/master
Home: https://github.com/phpmyadmin/phpmyadmin
Commit: 68a4cee50fac7c9e516c81853b0bbb8ecd713747
https://github.com/phpmyadmin/phpmyadmin/commit/68a4cee50fac7c9e516c81853b0bbb8ecd713747
Author: Marc Delisle <m...@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 <m...@infomarc.info>
------------------------------------------------------------------------------
Start Your Social Network Today - Download eXo Platform
Build your Enterprise Intranet with eXo Platform Software
Java Based Open Source Intranet - Social, Extensible, Cloud Ready
Get Started Now And Turn Your Intranet Into A Collaboration Platform
http://p.sf.net/sfu/ExoPlatform
_______________________________________________
Phpmyadmin-git mailing list
Phpmyadmin-git@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/phpmyadmin-git