aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-05-28 11:03:29 +0200
committerDaniel Gultsch <daniel@gultsch.de>2016-05-28 11:03:29 +0200
commit06bef5de8db774f052350c61c3bd4b43a5b4b582 (patch)
tree36445231757ece5ef7bc1b940ccc9f541bc43b30 /src/main/java
parent25f6651848b67d225967cf1bb35e037c998a5682 (diff)
use EOT as message seperator
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/eu/siacs/conversations/entities/Message.java2
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 818ac1d65..4b6877119 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 = " \u200B\n\n";
+ public static final String MERGE_SEPARATOR = "\n\u0004\n";
public static final int STATUS_RECEIVED = 0;
public static final int STATUS_UNSEND = 1;