Merge branch 'master' of https://github.com/necro-nemesis/Lokiap-webgui

5 years ago · 3ce1d4d4d5
parent 503c7b5463 dc47097bb9
commit 3ce1d4d4d5
1 changed files with 4 additions and 0 deletions
--- a/includes/functions.php
+++ b/includes/functions.php
@ -344,7 +344,11 @@ function DisplayOpenVPNConfig()
 function DisplayLokinetConfig()
 {
    exec('pidof lokinet | wc -l', $lokinetstatus);
+<<<<<<< HEAD
    exec(ip rule show default | grep lokinet | awk {'print $5'}, $rulestate);
+=======
+    $rulestate = exec(ip rule show default | grep lokinet | awk {'print $5'});
+>>>>>>> dc47097bb9215668fea3bb7ba59eaf48ca8f2155

    if ($lokinetstatus[0] == 0) {
        $status = '<div class="alert alert-danger alert-dismissable">Lokinet daemon is not running