tyler.durden/loganalyzer
1
0
Fork 0
mirror of https://github.com/rsyslog/loganalyzer.git synced 2025-09-22 17:38:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed merge problem

Browse Source
This commit is contained in:
Andre Lorbach 2012-05-22 16:00:18 +02:00
parent 2f733ed126
commit c014170ddd
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/include/functions_common.php
View File

@ -66,11 +66,7 @@ $LANG_EN = "en"; // Used for fallback
$LANG = "en"; // Default language $LANG = "en"; // Default language
// Default Template vars // Default Template vars
<<<<<<< HEAD:src/include/functions_common.php $content['BUILDNUMBER'] = "3.5.4";
$content['BUILDNUMBER'] = "3.5.3";
=======
$content['BUILDNUMBER'] = "3.4.3";
>>>>>>> 4c5e5b7bf5447adbd08054840ed29b0a083b1195:src/include/functions_common.php
$content['UPDATEURL'] = "http://loganalyzer.adiscon.com/files/version.txt"; $content['UPDATEURL'] = "http://loganalyzer.adiscon.com/files/version.txt";
$content['TITLE'] = "Adiscon LogAnalyzer :: Release " . $content['BUILDNUMBER']; // Default page title $content['TITLE'] = "Adiscon LogAnalyzer :: Release " . $content['BUILDNUMBER']; // Default page title
$content['BASEPATH'] = $gl_root_path; $content['BASEPATH'] = $gl_root_path;