package smims.networking.model;

public class Protokoll {

	public static final String CS_Welcome = "csGoedeDag!!!!!!";
	public static final String CS_GetBoard = "csgetboard";
	public static final String CS_RollDice = "csrolldice";
	public static final String CS_MoveCharacter = "csmovecharacter";
	public static final String CS_GetDiceResult = "csgetdiceresult";
	public static final String CS_WhoseTurn = "cswhoseturn";
	public static final String CS_Ready = "csready";
	public static final String CS_GetTurnState = "csgetturnstate";
	public static final String CS_GetThrowsLeft = "csgetthrowsleft";
	public static final String CS_GetOwnPlayerId = "csgetownplayerid";
	
	public static final String SC_Welcome = "scGoedeDag!!!!!!";
	public static final String SC_Board = "scsendboard";
	public static final String SC_DiceResult = "scsenddiceresult";
	public static final String SC_PlayerTurn = "scplayerturn";
	public static final String SC_GameStarts = "scgamestarts";
	public static final String SC_MoveNotAllowed = "scmovenotallowed";
	public static final String SC_ThrowsLeft = "scthrowsleft";
	public static final String SC_OwnPlayerId = "scownplayerid";
	public static final String SC_Error = "scerror";
	public static final String SC_MoveOk = "scmoveok";
	
	public static final String SC_Exception = "scFEHLER!!!";
	public static final String SC_NotYourTurn = "scnotyourturn";
	public static final String SC_TurnState = "scturnstate";
	public static final String SC_NoSuchCharacter = "scnosuchcharacter";
	
	public static final String SC_Exception = "scFEHLER!!!";
	public static final String SC_Stop = "Stop";
	
	public static final String Splitter = "#";
	
	
}

package smims.networking.model;

public class Protokoll {

	public static final String CS_Welcome = "csGoedeDag!!!!!!";
	public static final String CS_GetBoard = "csgetboard";
	public static final String CS_RollDice = "csrolldice";
	public static final String CS_MoveCharacter = "csmovecharacter";
	public static final String CS_GetDiceResult = "csgetdiceresult";
	public static final String CS_WhoseTurn = "cswhoseturn";
	public static final String CS_Ready = "csready";
	public static final String CS_GetTurnState = "csgetturnstate";
	public static final String CS_GetThrowsLeft = "csgetthrowsleft";
	public static final String CS_GetOwnPlayerId = "csgetownplayerid";
	
	public static final String SC_Welcome = "scGoedeDag!!!!!!";
	public static final String SC_Board = "scsendboard";
	public static final String SC_DiceResult = "scsenddiceresult";
	public static final String SC_PlayerTurn = "scplayerturn";
	public static final String SC_GameStarts = "scgamestarts";
	public static final String SC_MoveNotAllowed = "scmovenotallowed";
	public static final String SC_ThrowsLeft = "scthrowsleft";
	public static final String SC_OwnPlayerId = "scownplayerid";
	public static final String SC_Error = "scerror";
	public static final String SC_MoveOk = "scmoveok";
	
	public static final String SC_Exception = "scFEHLER!!!";
	public static final String SC_NotYourTurn = "scnotyourturn";
	public static final String SC_TurnState = "scturnstate";
	public static final String SC_NoSuchCharacter = "scnosuchcharacter";
	
	public static final String SC_Stop = "Stop";
	
	public static final String Splitter = "#";
	
	
}

Fix merge conflict