Fix merge conflicts

2013-07-11 14:18:21 -04:00 · 2013-07-11 14:18:21 -04:00 · 45d3f4326c
commit 45d3f4326c
parent 0fea53b7b8
5 changed files with 8 additions and 0 deletions
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@ -5,6 +5,7 @@
 *
 * @package PhpMyAdmin
 */
+
 if (! defined('PHPMYADMIN')) {
    exit;
 }
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@ -5,6 +5,7 @@
 *
 * @package PhpMyAdmin
 */
+
 if (! defined('PHPMYADMIN')) {
    exit;
 }
--- a/libraries/PMA.php
+++ b/libraries/PMA.php
@ -7,6 +7,10 @@
 *
 */

+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
 * Database listing.
 */
--- a/libraries/RecentTable.class.php
+++ b/libraries/RecentTable.class.php
@ -4,6 +4,7 @@
 *
 * @package PhpMyAdmin
 */
+
 if (! defined('PHPMYADMIN')) {
    exit;
 }
--- a/libraries/bookmark.lib.php
+++ b/libraries/bookmark.lib.php
@ -5,6 +5,7 @@
 *
 * @package PhpMyAdmin
 */
+
 if (! defined('PHPMYADMIN')) {
    exit;
 }