Annikka/evennia
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove remnant from merge collision

Browse source
This commit is contained in:
Griatch 2018-10-13 19:33:06 +02:00
parent 58116ff900
commit f85968fad3
1 changed files with 0 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
evennia/server/tests.py
View file

@ -144,4 +144,3 @@ class ThrottleTest(EvenniaTest):
# There should only be (cache_size * num_ips) total in the Throttle cache # 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)) self.assertEqual(sum([len(cache[x]) for x in cache.keys()]), throttle.cache_size * len(ips))
>>>>>>> develop