diff options
| author | lookshe <github@lookshe.org> | 2016-03-20 02:33:15 +0100 |
|---|---|---|
| committer | lookshe <github@lookshe.org> | 2016-03-20 02:34:01 +0100 |
| commit | a92ef6f07749b4b18cf3e9eb1722e572c545cabe (patch) | |
| tree | 98aea4177d6f8e53b9c7de6b0362d17ae309a2bf /src/main/java/de/thedevstack/conversationsplus/entities/Transferable.java | |
| parent | 75c8a4a6953fb5dd0cb07fdf51a50f65cf65e1cf (diff) | |
fixed merge error
Diffstat (limited to 'src/main/java/de/thedevstack/conversationsplus/entities/Transferable.java')
0 files changed, 0 insertions, 0 deletions