diff options
| author | lookshe <github@lookshe.org> | 2016-04-05 23:24:49 +0200 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-04-05 23:24:49 +0200 |
| commit | d6a076e11281d4c3fb6b9504fe99d799b04ebbbb (patch) | |
| tree | 7cbbe209ed0a883bcf29389d91979974444447c1 /src/main/java/eu/siacs/conversations/entities/Message.java | |
| parent | bfb3cb844578d06fad9aade3a7576ee44d785f70 (diff) | |
| parent | 5eedce91f9d92e5139f13fddb57314570f42b9ad (diff) | |
Merge tag '1.11.3' into trz/rebase
Diffstat (limited to 'src/main/java/eu/siacs/conversations/entities/Message.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/entities/Message.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java index 5fafb6c8..7a5be8f8 100644 --- a/src/main/java/eu/siacs/conversations/entities/Message.java +++ b/src/main/java/eu/siacs/conversations/entities/Message.java @@ -710,11 +710,11 @@ public class Message extends AbstractEntity { public int height = 0; } - public void setAxolotlFingerprint(String fingerprint) { + public void setFingerprint(String fingerprint) { this.axolotlFingerprint = fingerprint; } - public String getAxolotlFingerprint() { + public String getFingerprint() { return axolotlFingerprint; } |