[Phpmyadmin-git] [phpmyadmin/phpmyadmin] f5b826: Remove string at the end of file

Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f5b8267ed0c1ef8c91ce39284a9fb8de95609956 https://github.com/phpmyadmin/phpmyadmin/commit/f5b8267ed0c1ef8c91ce39284a9… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2014-02-03 (Mon, 03 Feb 2014) Changed paths: M libraries/DisplayResults.class.php Log Message: ----------- Remove string at the end of file Commit: 2caa9aac7b6d93acb1f08b0e3f18ec9124988c93 https://github.com/phpmyadmin/phpmyadmin/commit/2caa9aac7b6d93acb1f08b0e3f1… Author: Michal Čihař <mcihar(a)suse.cz> Date: 2014-02-03 (Mon, 03 Feb 2014) Changed paths: M libraries/DisplayResults.class.php Log Message: ----------- Merge remote-tracking branch 'origin/QA_4_1' Conflicts: libraries/DisplayResults.class.php Compare: https://github.com/phpmyadmin/phpmyadmin/compare/396991a194ba...2caa9aac7b6d