ServerConflictUpdate
This commit is contained in:
parent
828525a912
commit
6ee0b4fc73
1 changed files with 1 additions and 7 deletions
|
@ -47,15 +47,9 @@ namespace ZoFo.GameCore
|
||||||
{
|
{
|
||||||
UpdateGameEnded gameEnded = new UpdateGameEnded();
|
UpdateGameEnded gameEnded = new UpdateGameEnded();
|
||||||
networkManager.AddData(gameEnded);
|
networkManager.AddData(gameEnded);
|
||||||
<<<<<<< Updated upstream
|
|
||||||
networkManager.CloseConnection();
|
networkManager.CloseConnection();
|
||||||
}
|
}
|
||||||
internal void Update(GameTime gameTime)
|
public void Update(GameTime gameTime)
|
||||||
=======
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Update(GameTime gameTime)
|
|
||||||
>>>>>>> Stashed changes
|
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue