Fix merge commit

Author FeroxRev <Ferox2552@gmail.com>
Author date 2016-07-20 18:49:21
Author local date 2016-07-20 20:49:21 +0200
Committer FeroxRev <Ferox2552@gmail.com>
Committer date 2016-07-20 18:49:21
Committer local date 2016-07-20 20:49:21 +0200
Commit ea18bc0c4845447ee13d22240b805dc4725b0ca1
Tree 568fc03ee028a8993d35d217ce495550edc31e9b
Parent 48172c00efb43f13e476ebc9cc88cfbfe507c372
Parent 19825f8334fc83096f41109949f14f0943212ce7
Fix merge commit
Affected files:
PokemonGo/RocketAPI/Client.cs
You may download the files in Public Git.