Projects >> swp-uebersetzerbau-ss12 >>e111a1bbc8e12c1db99df7a5968f3714798a919d

Chunk
Conflicting content
import de.fuberlin.commons.util.EasyComparableObject;

public class State extends EasyComparableObject{
<<<<<<< HEAD
	private int id;
=======
	// XXX [Dustin] Ist es wirklich notwendig hier einen String zu nehmen? Warum nicht int/Integer?
	private String name;
>>>>>>> c22c64073723249ee11a821424e06a1e33a81ece

	public State(int id) {
		this.id = id;
Solution content
import de.fuberlin.commons.util.EasyComparableObject;

public class State extends EasyComparableObject{
	private int id;

	public State(int id) {
		this.id = id;
File
State.java
Developer's decision
Version 1
Kind of conflict
Attribute
Comment