fix bad merge
authorNikita Kozlov <nikita@elyzion.net>
Sun, 06 Nov 2011 00:35:02 +0100
changeset 957 55e6f3409146
parent 956 6b30719f4de6
child 958 f78522cede87
fix bad merge
src/com/beem/project/beem/service/Message.java
--- a/src/com/beem/project/beem/service/Message.java	Sat Nov 05 23:49:30 2011 +0100
+++ b/src/com/beem/project/beem/service/Message.java	Sun Nov 06 00:35:02 2011 +0100
@@ -69,6 +69,9 @@
     /** Error message type. */
     public static final int MSG_TYPE_ERROR = 400;
 
+    /** Informational message type. */
+    public static final int MSG_TYPE_INFO = 500;
+
     /** Parcelable.Creator needs by Android. */
     public static final Parcelable.Creator<Message> CREATOR = new Parcelable.Creator<Message>() {