lams-github

Conflicts:

        lams_admin/conf/language/lams/ApplicationResources.properties

        lams_central/conf/language/lams/ApplicationResources.properties

        lams_central/conf/language/lams/ApplicationResources_en_AU.properties

        lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

        lams_central/web/main.jsp

        lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

        lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

        lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

        lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

        lams_tool_assessment/conf/language/lams/ApplicationResources.properties

        lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

        lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

        lams_tool_lamc/web/authoring/itemlist.jsp

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

        lams_tool_scratchie/web/pages/authoring/start.jsp

        lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Show less