From 553b95c8aa8050559d8f9cbbe01ebf260b773b70 Mon Sep 17 00:00:00 2001
From: G0tti <chgottsc@uni-potsdam.de>
Date: Thu, 21 Jun 2018 10:33:59 +0200
Subject: [PATCH] Merge branch 'PeerAssessmentChristian' of
 C:\Users\Christian\Desktop\FInalGit\fltrail with conflicts.

---
 .../gf/modules/assessment/controller/view/QuizView.java          | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
index 077ebb23..ba71e076 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/assessment/controller/view/QuizView.java
@@ -1,6 +1,7 @@
 package unipotsdam.gf.modules.assessment.controller.view;
 
 import unipotsdam.gf.interfaces.IPeerAssessment;
+import unipotsdam.gf.modules.assessment.controller.model.Assessment;
 import unipotsdam.gf.modules.assessment.controller.model.*;
 import unipotsdam.gf.modules.assessment.controller.service.PeerAssessmentDummy;
 
-- 
GitLab