Skip to content

Commit

Permalink
fix merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
@Grover-c13
Grover-c13 committed Aug 1, 2016
1 parent 8bf31f5 commit 8e8b939
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/resources/protobuf
Submodule protobuf updated 15 files
+13 −0 .travis.yml
+11 −6 README.md
+9 −1 compile.py
+3 −3 src/POGOProtos/Data/Battle/BattleAction.proto
+1 −1 src/POGOProtos/Data/DownloadUrlEntry.proto
+1 −1 src/POGOProtos/Inventory/Candy.proto
+2 −2 src/POGOProtos/Inventory/InventoryItemData.proto
+1 −1 src/POGOProtos/Networking/Envelopes/RequestEnvelope.proto
+1 −1 src/POGOProtos/Networking/Envelopes/ResponseEnvelope.proto
+2 −2 src/POGOProtos/Networking/Envelopes/Unknown6.proto
+24 −3 src/POGOProtos/Networking/Envelopes/Unknown6Response.proto
+1 −1 src/POGOProtos/Networking/Requests/Messages/SetFavoritePokemonMessage.proto
+1 −1 src/POGOProtos/Networking/Requests/Messages/StartGymBattleMessage.proto
+3 −1 src/POGOProtos/Networking/Responses/GetIncensePokemonResponse.proto
+2 −2 src/POGOProtos/Settings/Master/MoveSettings.proto

0 comments on commit 8e8b939

Please sign in to comment.