diff options
| author | Christian Schneppe <christian@pix-art.de> | 2016-05-28 22:21:37 +0200 |
|---|---|---|
| committer | Christian Schneppe <christian@pix-art.de> | 2016-05-28 22:21:37 +0200 |
| commit | 08370421bff0a90920557cbf2de9b72db436a118 (patch) | |
| tree | 170265935af9fb1c12003a09c64018f2767a8591 /src/main/java/eu/siacs/conversations/entities | |
| parent | 5ec8a55ba51aa60862ec77eecb017257105fac80 (diff) | |
| parent | fde27f447f008c79b797214d6351dee770b39f96 (diff) | |
Merge remote-tracking branch 'refs/remotes/siacs/master'
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities')
| -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 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; |