Projects >> osce >>8f075bebba550bcae9e9833e1543f5ca4e582973

Chunk
Conflicting content 
import ch.unibas.medizin.osce.client.a_nonroo.client.ui.StudentSubDetailsViewImpl;
import ch.unibas.medizin.osce.client.a_nonroo.client.ui.StudentsView;
import ch.unibas.medizin.osce.client.a_nonroo.client.ui.StudentsViewImpl;
<<<<<<< HEAD
import ch.unibas.medizin.osce.client.a_nonroo.client.ui.renderer.EnumRenderer;
=======
import ch.unibas.medizin.osce.client.a_nonroo.client.ui.examination.MessageConfirmationDialogBox;
>>>>>>> 73c5b92e6258e7382bad69cdc574de6845793088
import ch.unibas.medizin.osce.client.a_nonroo.client.util.ApplicationLoadingScreenEvent;
import ch.unibas.medizin.osce.client.a_nonroo.client.util.MenuClickEvent;
import ch.unibas.medizin.osce.client.a_nonroo.client.util.RecordChangeEvent;
Solution content 
import ch.unibas.medizin.osce.client.a_nonroo.client.ui.StudentSubDetailsViewImpl;
import ch.unibas.medizin.osce.client.a_nonroo.client.ui.StudentsView;
import ch.unibas.medizin.osce.client.a_nonroo.client.ui.StudentsViewImpl;
import ch.unibas.medizin.osce.client.a_nonroo.client.ui.renderer.EnumRenderer;
import ch.unibas.medizin.osce.client.a_nonroo.client.ui.examination.MessageConfirmationDialogBox;
import ch.unibas.medizin.osce.client.a_nonroo.client.util.ApplicationLoadingScreenEvent;
import ch.unibas.medizin.osce.client.a_nonroo.client.util.MenuClickEvent;
import ch.unibas.medizin.osce.client.a_nonroo.client.util.RecordChangeEvent;
File
StudentsActivity.java
Developer's decision
Concatenation
Kind of conflict
Import
Chunk
Conflicting content 
import ch.unibas.medizin.osce.client.managed.request.StudentOscesRequest;
import ch.unibas.medizin.osce.client.style.resources.AdvanceCellTable;
import ch.unibas.medizin.osce.shared.OsMaConstant;
<<<<<<< HEAD
import ch.unibas.medizin.osce.shared.StudyYears;
=======
import ch.unibas.medizin.osce.shared.i18n.OsceConstants;
>>>>>>> 73c5b92e6258e7382bad69cdc574de6845793088

import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.activity.shared.AbstractActivity;
Solution content 
import ch.unibas.medizin.osce.client.managed.request.StudentOscesRequest;
import ch.unibas.medizin.osce.client.style.resources.AdvanceCellTable;
import ch.unibas.medizin.osce.shared.OsMaConstant;
import ch.unibas.medizin.osce.shared.StudyYears;
import ch.unibas.medizin.osce.shared.i18n.OsceConstants;

import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.activity.shared.AbstractActivity;
File
StudentsActivity.java
Developer's decision
Concatenation
Kind of conflict
Import