Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: a8866653ec52fa51dc5232edf29a761ae5747f1b https://github.com/phpmyadmin/phpmyadmin/commit/a8866653ec52fa51dc5232edf29a... Author: Madhura Jayaratne <madhura.cj@gmail.com> Date: 2014-11-04 (Tue, 04 Nov 2014) Changed paths: M js/sql.js Log Message: ----------- Fix merge error Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>