Mirrors/pokeapi
2
0
Fork 0
mirror of https://github.com/PokeAPI/pokeapi synced 2024-11-10 06:04:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #98 from bdchauvette/master

Browse source 
Fix leftover merge conflict from stash
This commit is contained in:
Paul Hallett 2016-02-12 12:10:40 +00:00
commit f0595fcbe9
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