Merge branch 'develop' of https://github.com/wordpress-mobile/WordPre…

…ss-Android into feature/plans-add-item # Conflicts: # libs/utils/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java
wordpress-mobile · Feb 2, 2016 · c3a1854 · c3a1854
2 parents 34ddb82 + 2ee06c3
commit c3a1854
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java b/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java
@@ -16,7 +16,8 @@
 public class AppLog {
     // T for Tag
     public enum T {READER, EDITOR, MEDIA, NUX, API, STATS, UTILS, NOTIFS, DB, POSTS, COMMENTS, THEMES, TESTS, PROFILING,
-        SIMPERIUM, SUGGESTION, MAIN, PLANS}
+        SIMPERIUM, SUGGESTION, MAIN, SETTINGS, PLANS}
+
     public static final String TAG = "WordPress";
     public static final int HEADER_LINE_COUNT = 2;