From b35a7f7a60f6bc6b9260d706f722273ab2fa899b Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Sun, 10 Dec 2017 20:21:02 +0100
Subject: [PATCH] Fix merge.

---
 irctest/server_tests/test_channel_operations.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/irctest/server_tests/test_channel_operations.py b/irctest/server_tests/test_channel_operations.py
index da60d51..1e04154 100644
--- a/irctest/server_tests/test_channel_operations.py
+++ b/irctest/server_tests/test_channel_operations.py
@@ -356,12 +356,8 @@ class JoinTestCase(cases.BaseServerTestCase):
         self.joinChannel(3, '#chan')
 
         self.connectClient('qux')
-<<<<<<< HEAD
-        self.sendLine(1, 'JOIN #chan')
-=======
         self.joinChannel(4, '#chan')
 
->>>>>>> e4c3490... Make tests around joining channels more deterministic
         # TODO: check foo is an operator
 
         # Synchronize