summaryrefslogtreecommitdiff
path: root/conn_tests/testconfig.ini
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2012-01-18 15:16:56 -0800
committerLance Stout <lancestout@gmail.com>2012-01-18 15:16:56 -0800
commit4f4c121d9b64a02fa86438066fca6fd81e66032f (patch)
tree3c7c4210700995545467e9edf7f093f4ae8c6022 /conn_tests/testconfig.ini
parent72e1ab47fc393176cb99ddaeaad1098e88472417 (diff)
downloadslixmpp-4f4c121d9b64a02fa86438066fca6fd81e66032f.tar.gz
slixmpp-4f4c121d9b64a02fa86438066fca6fd81e66032f.tar.bz2
slixmpp-4f4c121d9b64a02fa86438066fca6fd81e66032f.tar.xz
slixmpp-4f4c121d9b64a02fa86438066fca6fd81e66032f.zip
Fix merge errors and bot example.
Diffstat (limited to 'conn_tests/testconfig.ini')
0 files changed, 0 insertions, 0 deletions