Fixed conflicts

Author Brian <brian1461748123@gmail.com>
Author date 2016-07-30 11:45:27
Author local date 2016-07-30 04:45:27 -0700
Committer Brian <brian1461748123@gmail.com>
Committer date 2016-07-30 11:45:27
Committer local date 2016-07-30 04:45:27 -0700
Commit 5a563417f86bd87bc42348b0a9f4ad8918db46d2
Tree 2d5cbfb5cac7454081217a173977e289cb0988d5
Parent 7c5b9a9125a68148363718286d5f8606c87d02d2
Parent a31109ed3b0db49c9a5d369267e810d023418067
Fixed conflicts
Affected files:
PokemonGo/RocketAPI/Window/PokeUi.cs
You may download the files in Public Git.