Projects >> twp >>bbc0d351f7861c79aef90642522857af7bb7269b

Chunk
Conflicting content 
	public String readString() throws IOException {
		int type = reader.readByte();
<<<<<<< HEAD
		int length = type == LONG_STRING ? reader.readInt() : type - 17;
		byte[] value = new byte[length];
		reader.readFully(value);
		return new String(value, "UTF-8");
=======
		byte[] value = new byte[type - 17];
		reader.readFully(value);
		return new String(value);
>>>>>>> d7cc9eb05c64ea6f9c4a0723cc1413eb747e4fe7
	}

	public void writeString(String string) throws IOException {
Solution content 
	public String readString() throws IOException {
		int type = reader.readByte();
		int length = type == LONG_STRING ? reader.readInt() : type - 17;
		byte[] value = new byte[length];
		reader.readFully(value);
		return new String(value, "UTF-8");
	}

	public void writeString(String string) throws IOException {
File
TWPClient.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation
Return statement
Variable