From 22b5c1279af9d68ea650daf6121697709ef5c84f Mon Sep 17 00:00:00 2001
From: necro-nemesis <necro_nemesis@hotmail.com>
Date: Thu, 25 Apr 2019 21:17:00 -0400
Subject: [PATCH] fix merge conflict

---
 includes/functions.php | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/includes/functions.php b/includes/functions.php
index 3d4a2f2..6defece 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -344,11 +344,7 @@ 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
+//    exec(ip rule show default | grep lokinet | awk {'print $5'}, $rulestate);
 
     if ($lokinetstatus[0] == 0) {
         $status = '<div class="alert alert-danger alert-dismissable">Lokinet daemon is not running