Merge remote-tracking branch 'origin/master'

# Conflicts: # src/main/java/com/faris/kingkits/helper/api/ActionBarAPI.java
FarisR99 · Dec 15, 2016 · 0dffc05 · 0dffc05
2 parents 7a9756b + 422cb67
commit 0dffc05
Showing 1 changed file with 4 additions and 0 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,6 +56,10 @@ public static void initialiseReflection() {
 			initialised = true;
 		} catch (Exception ex) {
 			ex.printStackTrace();
+<<<<<<< HEAD
+=======
+
+>>>>>>> origin/master
 			initialised = false;
 		}
 	}