search

foxtrotzulu94 / ECE-Pokedex

An Android App for those that want to be the very best! You Gotta Catch 'Em All!
MIT License
1 stars 1 forks source link

Issue #12 db access #37

Closed minicole closed 9 years ago

minicole commented 9 years ago

This pull-request is slightly weird because some of the code of PokemonFactory has already been pushed to master with other commits.

This is basically for code in the PokemonFactory, and changes in the Pokemon package (so /pokemon/, where \ is Pokemon or MinimalPokemon or Type or etc.)

foxtrotzulu94 commented 9 years ago

Builds correctly and everything looks good overall. The merging problem is most likely due to the database files that have been updated in both Master and on this branch. I'll make an SQL script to backup/recover the database just in case anything happens. Merge to master and verify by building afterwards.