From 45d3f4326cad32b09b8d3a07382faf1eeda30dba Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Thu, 11 Jul 2013 14:18:21 -0400
Subject: [PATCH] Fix merge conflicts

---
 libraries/Config.class.php        | 1 +
 libraries/List_Database.class.php | 1 +
 libraries/PMA.php                 | 4 ++++
 libraries/RecentTable.class.php   | 1 +
 libraries/bookmark.lib.php        | 1 +
 5 files changed, 8 insertions(+)

diff --git a/libraries/Config.class.php b/libraries/Config.class.php
index 9a7d61f786..8cabc91328 100644
--- a/libraries/Config.class.php
+++ b/libraries/Config.class.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+
 if (! defined('PHPMYADMIN')) {
     exit;
 }
diff --git a/libraries/List_Database.class.php b/libraries/List_Database.class.php
index f2902e1ae3..fe8dcfc26c 100644
--- a/libraries/List_Database.class.php
+++ b/libraries/List_Database.class.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+
 if (! defined('PHPMYADMIN')) {
     exit;
 }
diff --git a/libraries/PMA.php b/libraries/PMA.php
index 0d0c39e55b..021917d374 100644
--- a/libraries/PMA.php
+++ b/libraries/PMA.php
@@ -7,6 +7,10 @@
  *
  */
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * Database listing.
  */
diff --git a/libraries/RecentTable.class.php b/libraries/RecentTable.class.php
index 9468eeb1c0..b50ad65900 100644
--- a/libraries/RecentTable.class.php
+++ b/libraries/RecentTable.class.php
@@ -4,6 +4,7 @@
  *
  * @package PhpMyAdmin
  */
+
 if (! defined('PHPMYADMIN')) {
     exit;
 }
diff --git a/libraries/bookmark.lib.php b/libraries/bookmark.lib.php
index 9f3d52f4f0..b87fb746aa 100644
--- a/libraries/bookmark.lib.php
+++ b/libraries/bookmark.lib.php
@@ -5,6 +5,7 @@
  *
  * @package PhpMyAdmin
  */
+
 if (! defined('PHPMYADMIN')) {
     exit;
 }