From f6934376e89504d5008d296c7018c994bb0f7063 Mon Sep 17 00:00:00 2001
From: NewEraCracker <neweracracker@gmail.com>
Date: Thu, 7 Jan 2016 19:19:33 +0000
Subject: Fix conflicts caused by merging

---
 src/usr/local/www/status_logs_vpn.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php
index ca4e887..98b88fa 100644
--- a/src/usr/local/www/status_logs_vpn.php
+++ b/src/usr/local/www/status_logs_vpn.php
@@ -186,13 +186,13 @@ if (!$rawfilter) {
 							<?=htmlspecialchars($filterent['time'])?>
 						</td>
 						<td style="word-wrap:break-word; word-break:break-all; white-space:normal">
-							<? if ($filterent['action'] == "login") { ?>
+							<?php if ($filterent['action'] == "login") { ?>
 							<i class="fa fa-arrow-left" title="in"></i>
-							<? } else if ($filterent['action'] == "logout") { ?>
+							<?php } else if ($filterent['action'] == "logout") { ?>
 							<i class="fa fa-arrow-right" title="out"></i>
-							<? } else { ?>
+							<?php } else { ?>
 							<i><?=htmlspecialchars($filterent['action'])?></i>
-							<? } ?>
+							<?php } ?>
 						</td>
 						<td>
 							<?=htmlspecialchars($filterent['user'])?>
-- 
cgit v1.1