# HG changeset patch # User Nikita Kozlov # Date 1320536102 -3600 # Node ID 55e6f340914604171f10937b94454758527df4fb # Parent 6b30719f4de64f67d79b1d361007cb13ce77a9e6 fix bad merge diff -r 6b30719f4de6 -r 55e6f3409146 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 CREATOR = new Parcelable.Creator() {