klaute/MMDVMHost-Dashboard
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/dg9vh/MMDVMHost-Dashboard

Browse source 
Conflicts:
	include/functions.php
This commit is contained in:
dg9vh 2017-03-28 08:32:29 +00:00
commit f0b3ba195b
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/functions.php
View file

@ -856,6 +856,7 @@ function getGitVersion(){
} else { } else {
return 'GitID unknown'; return 'GitID unknown';
} }
<<<<<<< HEAD
} }
function getDMRReflectors($network) { function getDMRReflectors($network) {
@ -881,5 +882,7 @@ function getDMRReflectorsFromURL($url) {
$refls[] = str_getcsv($row,"@",''); $refls[] = str_getcsv($row,"@",'');
} }
return $refls; return $refls;
=======
>>>>>>> 45c79329737e865e19bb761c4f3b3321107b09ba
} }
?> ?>