NamTThai / PokemonShowdownAndroidClient

Other
44 stars 14 forks source link

Findbattle team spinner + export fixes + teambuilder tier changes #47

Closed CLEMENTINATOR closed 9 years ago

CLEMENTINATOR commented 9 years ago
NamTThai commented 9 years ago

And there is a merge conflict

CLEMENTINATOR commented 9 years ago

Probably since you merged #48. I'll look into it tonight.

Fixed. On 3 Dec 2014 18:54, "Nam Thai" notifications@github.com wrote:

And there is a merge conflict

— Reply to this email directly or view it on GitHub https://github.com/NamTThai/PokemonShowdownAndroidClient/pull/47#issuecomment-65455486 .