Projects >> attendance >>0b1231b8b3df81318f3070182998bb54b6cab1ba

Chunk
Conflicting content 
		datastore = ModelFactory.newObjectDatastore();
	}

<<<<<<< HEAD
	public MessageThreadController getMessageThreadController() {
		return new MessageThreadController(this);
	}

	public AbsenceController getAbscencesController() {
=======
	public AbsenceController getAbsencesController() {
>>>>>>> 99e9432c199eb07a7bc2e5ceaa95c00bf5a01f39
		return new AbsenceController(this);
	}
Solution content 
		datastore = ModelFactory.newObjectDatastore();
	}

	public MessageThreadController getMessageThreadController() {
		return new MessageThreadController(this);
	}

	public AbsenceController getAbsencesController() {
		return new AbsenceController(this);
	}
File
DataTrain.java
Developer's decision
Combination
Kind of conflict
Method declaration
Method signature