aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/eu/siacs/conversations/xmpp
diff options
context:
space:
mode:
authorlookshe <github@lookshe.org>2016-03-20 01:59:41 +0100
committerlookshe <github@lookshe.org>2016-03-20 01:59:41 +0100
commit98e61f189c5f8bce7a001997fa2352c0c27f2778 (patch)
tree95c8b87a1a561a10917537e17122667a2eea9d88 /src/main/java/eu/siacs/conversations/xmpp
parentfb00372269ab0ed9ed0fbc1bd502695ffc17dd1b (diff)
fixed merge errors
Diffstat (limited to 'src/main/java/eu/siacs/conversations/xmpp')
0 files changed, 0 insertions, 0 deletions