Fix merges

2021-02-22 18:33:42 +01:00 · 2021-02-22 18:33:42 +01:00 · e9a2bdd008
parent 4ded96fbba
commit e9a2bdd008
2 changed files with 1 additions and 1 deletions
--- 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
--- 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):