Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/tallypokemap/Monocle int…
Browse files Browse the repository at this point in the history
…o develop
  • Loading branch information
tallypokemap committed Jun 17, 2017
2 parents 0b8fafc + 2981baf commit 9e29b92
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion monocle/web_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

from monocle import sanitized as conf
from monocle.db import get_forts, Pokestop, session_scope, Sighting, Spawnpoint
from monocle.utils import Units, get_address
from monocle.utils import Units, get_address, calc_pokemon_level
from monocle.names import DAMAGE, MOVES, POKEMON

if conf.MAP_WORKERS:
Expand Down

0 comments on commit 9e29b92

Please sign in to comment.