Projects >> jgralab >>d86b4d52838923ea27e5c57f61af50a130e24704

Chunk
Conflicting content 
		this.unmarkedValue = newUnmarkedValue;
	}
	
<<<<<<< HEAD
	@Override
	public long get(T parameter) {
		return getMark(parameter);
	}

	@Override
	public boolean isDefined(T parameter) {
		return isMarked(parameter);
	}

	@Override
	public void set(T parameter, long value) {
		mark(parameter, value);
	}

=======
>>>>>>> 829cb856abb8e7306560de01600bb6d3b8503164
}
Solution content 
		this.unmarkedValue = newUnmarkedValue;
	}
	
	@Override
	public long get(T parameter) {
		return getMark(parameter);
	}

	@Override
	public boolean isDefined(T parameter) {
		return isMarked(parameter);
	}

	@Override
	public void set(T parameter, long value) {
		mark(parameter, value);
	}

}
File
LongGraphMarker.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration
Chunk
Conflicting content 
		};
	}

<<<<<<< HEAD
	@Override
	public boolean get(GraphElement parameter) {
		return isMarked(parameter);
	}

	@Override
	public boolean isDefined(GraphElement parameter) {
		return true;
	}

	@Override
	public void set(GraphElement parameter, boolean value) {
		if (value) {
			mark(parameter);
		} else {
			removeMark(parameter);
		}
	}

=======
>>>>>>> 829cb856abb8e7306560de01600bb6d3b8503164
}
Solution content 
		};
	}

	@Override
	public boolean get(GraphElement parameter) {
		return isMarked(parameter);
	}

	@Override
	public boolean isDefined(GraphElement parameter) {
		return true;
	}

	@Override
	public void set(GraphElement parameter, boolean value) {
		if (value) {
			mark(parameter);
		} else {
			removeMark(parameter);
		}
	}

}
File
SubGraphMarker.java
Developer's decision
Version 1
Kind of conflict
Annotation
Method declaration