From c046976edc70db866a7b344cb741aff842b15b2f Mon Sep 17 00:00:00 2001 From: Griatch Date: Sat, 13 Oct 2018 19:33:06 +0200 Subject: [PATCH] Remove remnant from merge collision --- evennia/server/tests.py | 1 - 1 file changed, 1 deletion(-) diff --git a/evennia/server/tests.py b/evennia/server/tests.py index c9497fb261..71c77a2129 100644 --- a/evennia/server/tests.py +++ b/evennia/server/tests.py @@ -144,4 +144,3 @@ class ThrottleTest(EvenniaTest): # There should only be (cache_size * num_ips) total in the Throttle cache self.assertEqual(sum([len(cache[x]) for x in cache.keys()]), throttle.cache_size * len(ips)) ->>>>>>> develop