mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-08 02:42:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge conflict resolution

Browse Source
This commit is contained in:
Dylan K. Taylor
2017-04-27 14:27:29 +01:00
parent dc71eb5246 84ec944b6b
commit 7aeb3129ac
9 changed files with 151 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pocketmine/network/mcpe/NetworkSession.php
View File

@ -292,6 +292,4 @@ interface NetworkSession{
public function handleStopSound(StopSoundPacket $packet) : bool;
public function handleSetTitle(SetTitlePacket $packet) : bool;
public function handleUnknown(UnknownPacket $packet) : bool;
}