Update SRC

FarisR99 · Dec 15, 2016 · e09fdf7 · e09fdf7
1 parent 0dffc05
commit e09fdf7
Showing 1 changed file with 0 additions and 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
@@ -56,10 +56,6 @@ public static void initialiseReflection() {
 			initialised = true;
 		} catch (Exception ex) {
 			ex.printStackTrace();
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/master
 			initialised = false;
 		}
 	}