Merge branch 'master' of https://github.com/dg9vh/MMDVMHost-Dashboard
Conflicts: include/functions.php
This commit is contained in:
commit
f0b3ba195b
1 changed files with 3 additions and 0 deletions
|
@ -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
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Reference in a new issue