Projects >> Custom-Salem >>b2802e0c772ce876a74e5f29da479de02ccdd202

Chunk
Conflicting content
				}
			    }
			    Message msg = new Message(MSG_SESS);
<<<<<<< HEAD
			    msg.adduint16(1);
			    msg.addstring("Salem");
=======
			    msg.adduint16(2);
			    msg.addstring("Haven");
>>>>>>> 71e1381bd1c10acd288429c454708867953cef7f
			    msg.adduint16(PVER);
			    msg.addstring(username);
			    msg.adduint16(cookie.length);
Solution content
				}
			    }
			    Message msg = new Message(MSG_SESS);
			    msg.adduint16(2);
			    msg.addstring("Salem");
			    msg.adduint16(PVER);
			    msg.addstring(username);
			    msg.adduint16(cookie.length);
File
Session.java
Developer's decision
Combination
Kind of conflict
Method invocation