From c8c968a7e4ff2ee80ba831abe6f34a6c7ffa9656 Mon Sep 17 00:00:00 2001 From: SJost Date: Mon, 19 Feb 2018 18:10:41 +0100 Subject: [PATCH] minor merge conflict resolved --- src/Handler/Course.hs | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/Handler/Course.hs b/src/Handler/Course.hs index 5a3030c21..77c42835f 100644 --- a/src/Handler/Course.hs +++ b/src/Handler/Course.hs @@ -277,16 +277,8 @@ newCourseForm template = identForm FIDcourse $ \html -> do -- & addAttr "disabled" "disabled" & setTooltip "Muss innerhalb des Semesters eindeutig sein") (cfShort <$> template) -<<<<<<< HEAD <*> areq termActiveField (fsb "Semester") (cfTerm <$> template) <*> areq schoolField (fsb "Institut") (cfSchool <$> template) -||||||| merged common ancestors - <*> areq termExistsField (fsb "Semester") (cfTerm <$> template) - <*> areq (selectField schools) (fsb "Institut") (cfSchool <$> template) -======= - <*> areq termExistsField (fsb "Semester") (cfTerm <$> template) - <*> areq schoolField (fsb "Institut") (cfSchool <$> template) ->>>>>>> Sheets still incomplete, show sheet list and working. sheetAdmin template is not yet working <*> aopt (natField "Kapazität") (fsb "Kapazität") (cfCapacity <$> template) <*> areq checkBoxField (fsb "Anmeldung") (cfHasReg <$> template) <*> aopt utcTimeField (fsb "Anmeldung von:") (cfRegFrom <$> template)