From d0af39d6699703aae5f8304d9509d9f3b0d8665c Mon Sep 17 00:00:00 2001
From: dg9vh <kim@huebel-online.de>
Date: Sun, 15 May 2016 18:56:27 +0000
Subject: [PATCH] better version-info of MMDVMHost since MMDVMHost-build
 20160515.

---
 include/functions.php | 6 ------
 index.php             | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 6d235ba..17bfaa4 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -3,18 +3,12 @@
 function getMMDVMHostVersion() {
 	// returns creation-time of MMDVMHost as version-number
 	$filename = MMDVMHOSTPATH . "MMDVMHost";
-<<<<<<< HEAD
-	exec($filename . " 2>&1", $output);
-	$version = substr($output[1], 10, 4)."-".substr($output[1], 14, 2)."-".substr($output[1], 16, 2)." (compiled ".getMMDVMHostFileVersion().")";
-	return $version;
-=======
 	exec($filename." -v 2>&1", $output);
 	if (substr($output[0],18,8) == ".ini fil") {
 		return getMMDVMHostFileVersion();
 	} else {
 		return substr($output[0],18,8)." (compiled ".getMMDVMHostFileVersion().")";
 	}
->>>>>>> d49dbc67902a058b9de8b74c08002ee49f6366c7
 }
 
 function getMMDVMHostFileVersion() {
diff --git a/index.php b/index.php
index 30273fa..b422412 100644
--- a/index.php
+++ b/index.php
@@ -33,11 +33,7 @@ include "include/functions.php";
   	echo "Hotspot";
   }
   ?>:</small>  <?php echo getCallsign($mmdvmconfigs) ?></h1>
-<<<<<<< HEAD
-  <h4>MMDVMHost by G4KLX - Version: <?php echo getMMDVMHostVersion() ?></h4>
-=======
   <h4>MMDVMHost by G4KLX Version: <?php echo getMMDVMHostVersion() ?></h4>
->>>>>>> d49dbc67902a058b9de8b74c08002ee49f6366c7
 </div>
 <?php
 // Here you can feel free to disable info-sections by commenting out with // before include