diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-31 21:38:06 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-31 21:38:06 +0200 |
| commit | c23642b8cd2c06c5f3e9cf7f88d31ed5c6f78614 (patch) | |
| tree | a7c53e5dd6dd6e85213cff834d35316a29617753 /src/main/java/eu/siacs/conversations/entities/Message.java | |
| parent | 2cdc31a6887f242dfe4faca91af63ffd4e74ef67 (diff) | |
| parent | ea6a008b39b0f669f66f3c8aec08b4deb3ece154 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Message.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 3a924e530..21837386d 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -19,7 +19,7 @@ public class Message extends AbstractEntity { public static final String TABLENAME = "messages"; - public static final String MERGE_SEPARATOR = "\n\u0004\n"; + public static final String MERGE_SEPARATOR = "\n\u200B\n"; public static final int STATUS_RECEIVED = 0; public static final int STATUS_UNSEND = 1; |