Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 9555a21a3dc873844a4cb5cf59c5194eb920c3a5 https://github.com/phpmyadmin/phpmyadmin/commit/9555a21a3dc873844a4cb5cf59c5... Author: Marc Delisle marc@infomarc.info Date: 2014-12-11 (Thu, 11 Dec 2014)

Changed paths: M libraries/structure.lib.php

Log Message: ----------- Another instance of Undefined index central_columnswork

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: ffa83ae0d7367dc742a2e9195be9727a73592328 https://github.com/phpmyadmin/phpmyadmin/commit/ffa83ae0d7367dc742a2e9195be9... Author: Marc Delisle marc@infomarc.info Date: 2014-12-11 (Thu, 11 Dec 2014)

Changed paths: M libraries/structure.lib.php

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

Signed-off-by: Marc Delisle marc@infomarc.info

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a0845e879f31...ffa83ae0d736