mirror of
https://github.com/vanitasvitae/Smack.git
synced 2024-11-29 23:42:06 +01:00
057d00c9de
SMACK-586 Conflicts: smack-core/src/main/java/org/jivesoftware/smack/ConnectionConfiguration.java smack-tcp/src/main/java/org/jivesoftware/smack/tcp/XMPPTCPConnection.java |
||
---|---|---|
.. | ||
main/java/org/jivesoftware/smack/tcp | ||
test/java/org/jivesoftware/smack/tcp |