From 90d968b447729405ee8b6cc5bb406b832ec3c99f Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Sat, 13 Jul 2013 19:30:11 -0400
Subject: [PATCH] Fix merge conflicts

---
 libraries/config.default.php                      | 6 +++++-
 libraries/plugins/auth/swekey/swekey.auth.lib.php | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/libraries/config.default.php b/libraries/config.default.php
index 0b2512641a..cdab9e1ca6 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -557,7 +557,11 @@ $cfg['ServerDefault'] = 1;
  *
  * @global boolean $cfg['VersionCheck']
  */
-$cfg['VersionCheck'] = VERSION_CHECK_DEFAULT;
+if (defined('VERSION_CHECK_DEFAULT')) {
+    $cfg['VersionCheck'] = VERSION_CHECK_DEFAULT;
+} else {
+    $cfg['VersionCheck'] = true;
+}
 
 /**
  * maximum number of db's displayed in database list
diff --git a/libraries/plugins/auth/swekey/swekey.auth.lib.php b/libraries/plugins/auth/swekey/swekey.auth.lib.php
index 2231de469d..678cb1a61d 100644
--- a/libraries/plugins/auth/swekey/swekey.auth.lib.php
+++ b/libraries/plugins/auth/swekey/swekey.auth.lib.php
@@ -3,6 +3,10 @@
  * @package Swekey
  */
 
+if (! defined('PHPMYADMIN')) {
+    exit;
+}
+
 /**
  * Checks Swekey authentication.
  */