Fixed conflicts

Author Brian <brian1461748123@gmail.com>
Author date 2016-07-28 02:15:52
Author local date 2016-07-27 19:15:52 -0700
Committer Brian <brian1461748123@gmail.com>
Committer date 2016-07-28 02:15:52
Committer local date 2016-07-27 19:15:52 -0700
Commit 2f673b25581e2cd564cf79ba455a1b30ee1e5713
Tree 8c472dee33ff10522381570377e9a04cd9aed011
Parent 299462557389af98b913e3094da9c9f0ef20e171
Parent 0f74a2a071c15efdc3d5fb795232a85a3a0aaf55
Fixed conflicts
Affected files:
PokemonGo/RocketAPI/Window/MainForm.Designer.cs
PokemonGo/RocketAPI/Window/MainForm.cs
You may download the files in Public Git.