val/irctest
1
0
Fork 0
mirror of https://github.com/progval/irctest.git synced 2025-04-05 23:09:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge.

Browse Source
This commit is contained in:
Valentin Lorentz
2017-12-10 20:21:02 +01:00
parent f47584589b
commit b35a7f7a60
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
irctest/server_tests/test_channel_operations.py
View File

@ -356,12 +356,8 @@ class JoinTestCase(cases.BaseServerTestCase):
self.joinChannel(3, '#chan') self.joinChannel(3, '#chan')
self.connectClient('qux') self.connectClient('qux')
<<<<<<< HEAD
self.sendLine(1, 'JOIN #chan')
=======
self.joinChannel(4, '#chan') self.joinChannel(4, '#chan')
>>>>>>> e4c3490... Make tests around joining channels more deterministic
# TODO: check foo is an operator # TODO: check foo is an operator
# Synchronize # Synchronize