Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorninadsp <ninadsp16289@gmail.com>2010-07-29 17:47:25 +0400
committerninadsp <ninadsp16289@gmail.com>2010-07-29 17:47:25 +0400
commita2f78a6d38f74f0cc62f2a5837e682901331c21e (patch)
treeceab0c3ae4efe05fe345f270bdf4d236d24ef63d /themes.php
parent2bec345a46d11293b93c2b06bf8009c913cde8fb (diff)
parentd0fc397fe1c474150883e85a791a012a7ae03380 (diff)
Resolve merge conflicts for upstream merge
Diffstat (limited to 'themes.php')
-rwxr-xr-xthemes.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/themes.php b/themes.php
index a996030f46..e58933fa4c 100755
--- a/themes.php
+++ b/themes.php
@@ -8,13 +8,13 @@
/**
* get some globals
*/
-require_once './libraries/common.inc.php';
+require './libraries/common.inc.php';
/* Theme Select */
$path_to_themes = $cfg['ThemePath'] . '/';
/* set language and charset */
-require_once './libraries/header_http.inc.php';
+require './libraries/header_http.inc.php';
/* HTML header */
$page_title = 'phpMyAdmin - ' . __('Theme / Style');