diff options
author | iNPUTmice <daniel@gultsch.de> | 2014-12-13 13:55:24 +0100 |
---|---|---|
committer | iNPUTmice <daniel@gultsch.de> | 2014-12-13 13:55:24 +0100 |
commit | 02a89f4ce2228c2e0f528f89fa1fe850c6f50fe8 (patch) | |
tree | 31f87dfe762eb5f3ac28f29e28d860f5809edd0f /src/main/java/eu/siacs/conversations/entities/AbstractEntity.java | |
parent | 2368ba518dbe16a2718de0b65470d9a7348f0bea (diff) | |
parent | b523518e4b5a98d5a30aed2ec246fc83c42f5f6c (diff) |
Merge branch 'feature/mam' into development
Conflicts:
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/AbstractEntity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/entities/AbstractEntity.java | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java b/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java index 92b8a729..957b0a14 100644 --- a/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java +++ b/src/main/java/eu/siacs/conversations/entities/AbstractEntity.java @@ -17,5 +17,4 @@ public abstract class AbstractEntity { public boolean equals(AbstractEntity entity) { return this.getUuid().equals(entity.getUuid()); } - } |