From e9a2bdd00806a7a6e2f688804b13accbc3186d7d Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval+git@progval.net>
Date: Mon, 22 Feb 2021 18:33:42 +0100
Subject: [PATCH] Fix merges

---
 irctest/server_tests/test_lusers.py          | 1 +
 irctest/server_tests/test_register_verify.py | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/irctest/server_tests/test_lusers.py b/irctest/server_tests/test_lusers.py
index a2b7eb7..806718f 100644
--- a/irctest/server_tests/test_lusers.py
+++ b/irctest/server_tests/test_lusers.py
@@ -1,4 +1,5 @@
 import re
+import time
 from dataclasses import dataclass
 
 from irctest import cases
diff --git a/irctest/server_tests/test_register_verify.py b/irctest/server_tests/test_register_verify.py
index c072b15..8affa42 100644
--- a/irctest/server_tests/test_register_verify.py
+++ b/irctest/server_tests/test_register_verify.py
@@ -62,7 +62,6 @@ class TestRegisterEmailVerified(cases.BaseServerTestCase):
                 }
             )
         }
-        return config
 
     @cases.SpecificationSelector.requiredBySpecification('Oragono')
     def testBeforeConnect(self):