Skip to content
Snippets Groups Projects
Commit 4b0c34f1 authored by Martin Staehr's avatar Martin Staehr
Browse files

#40 fix merge error

parent d2f060da
No related branches found
No related tags found
No related merge requests found
......@@ -4,6 +4,7 @@ package unipotsdam.gf.interfaces;
import unipotsdam.gf.core.management.project.Project;
import unipotsdam.gf.core.management.user.User;
import unipotsdam.gf.core.states.model.ConstraintsMessages;
import unipotsdam.gf.modules.assessment.controller.model.StudentIdentifier;
import unipotsdam.gf.modules.journal.model.EPortfolio;
import unipotsdam.gf.modules.journal.model.Journal;
import unipotsdam.gf.modules.researchreport.ResearchReport;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment