Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2024-11-22 11:23:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix leftover merge conflict from stash

Browse source
This commit is contained in:
Ben Chauvette 2016-02-11 22:36:39 -05:00
parent 29583e8461
commit 84b8e7c256
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/v2/__init__.py
View file

@ -1,5 +1 @@
<<<<<<< Updated upstream
from .build import *
=======
from build import *
>>>>>>> Stashed changes