From c014170ddd1316503536f93c57eab5dede0e918f Mon Sep 17 00:00:00 2001 From: Andre Lorbach Date: Tue, 22 May 2012 16:00:18 +0200 Subject: [PATCH] Fixed merge problem --- src/include/functions_common.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/include/functions_common.php b/src/include/functions_common.php index ffcd59b..98577f2 100644 --- a/src/include/functions_common.php +++ b/src/include/functions_common.php @@ -66,11 +66,7 @@ $LANG_EN = "en"; // Used for fallback $LANG = "en"; // Default language // Default Template vars -<<<<<<< HEAD:src/include/functions_common.php -$content['BUILDNUMBER'] = "3.5.3"; -======= -$content['BUILDNUMBER'] = "3.4.3"; ->>>>>>> 4c5e5b7bf5447adbd08054840ed29b0a083b1195:src/include/functions_common.php +$content['BUILDNUMBER'] = "3.5.4"; $content['UPDATEURL'] = "http://loganalyzer.adiscon.com/files/version.txt"; $content['TITLE'] = "Adiscon LogAnalyzer :: Release " . $content['BUILDNUMBER']; // Default page title $content['BASEPATH'] = $gl_root_path;