From 3c110278615f2aa8229f72694643ea7f1969df7f Mon Sep 17 00:00:00 2001
From: dg9vh <dg9vh@darc.de>
Date: Tue, 28 Mar 2017 08:35:17 +0000
Subject: [PATCH] merge fix

---
 include/functions.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/functions.php b/include/functions.php
index 8c84ce3..bdd2bef 100644
--- a/include/functions.php
+++ b/include/functions.php
@@ -856,7 +856,6 @@ function getGitVersion(){
 	} else {
 		return 'GitID unknown';
 	}
-<<<<<<< HEAD
 }
 
 function getDMRReflectors($network) {
@@ -882,7 +881,5 @@ function getDMRReflectorsFromURL($url) {
         $refls[] = str_getcsv($row,"@",'');
     }
     return $refls;
-=======
->>>>>>> 45c79329737e865e19bb761c4f3b3321107b09ba
 }
 ?>