Remove remnant from merge collision

2018-10-13 19:33:06 +02:00 · 2018-10-13 19:33:06 +02:00 · f85968fad3
commit f85968fad3
parent 58116ff900
1 changed files with 0 additions and 1 deletions
--- 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