From daff2f41faf4b0f8b7def9edc294aace9976f068 Mon Sep 17 00:00:00 2001
From: Hendrik <hendrik.huang@student.uva.nl>
Date: Fri, 20 Jan 2017 12:29:34 +0100
Subject: [PATCH] minor fix

---
 website/views/adminpanel.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/website/views/adminpanel.php b/website/views/adminpanel.php
index 86c674a..52681a4 100644
--- a/website/views/adminpanel.php
+++ b/website/views/adminpanel.php
@@ -99,15 +99,8 @@ if ($_SERVER["REQUEST_METHOD"] == "POST") {
         changeMultipleGroupStatusByID($db, $_POST["checkbox-group"], $_POST["groupbatchactions"]);
     }
 
-<<<<<<< HEAD
     if (isset($_POST["pageselect"])) {
         $currentpage = $_POST["pageselect"];
-=======
-    if (!empty($_POST["actions"]) && !empty($_POST["userID"])) {
-        changeUserStatusByID($_POST["userID"], $_POST["actions"]);
-    } elseif (!empty($_POST["actions"]) && !empty($_POST["groupID"])) {
-        changeGroupStatusByID($_POST["groupID"], $_POST["actions"]);
->>>>>>> master
     }
 
 }