From e09fdf754eb9b2c33b123f66f468c58bffba4a09 Mon Sep 17 00:00:00 2001
From: KingFaris10 <business_faris@hotmail.com>
Date: Thu, 15 Dec 2016 13:46:46 +0000
Subject: [PATCH] Update SRC

---
 src/main/java/com/faris/kingkits/helper/api/ActionBarAPI.java | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/main/java/com/faris/kingkits/helper/api/ActionBarAPI.java b/src/main/java/com/faris/kingkits/helper/api/ActionBarAPI.java
index 2cdbfcd..ff8c7cd 100644
--- a/src/main/java/com/faris/kingkits/helper/api/ActionBarAPI.java
+++ b/src/main/java/com/faris/kingkits/helper/api/ActionBarAPI.java
@@ -56,10 +56,6 @@ public static void initialiseReflection() {
 			initialised = true;
 		} catch (Exception ex) {
 			ex.printStackTrace();
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/master
 			initialised = false;
 		}
 	}