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/web/includes/javascript/ckconfig_custom.js

#       lams_central/web/main.jsp

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

#       lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

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

#       lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.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/AssessmentConstants.java

#       lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

#       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/LearningController.java

#       lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

#       lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

#       lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

#       lams_tool_assessment/web/pages/learning/parts/ordering.jsp

#       lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

#       lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

#       lams_tool_lamc/conf/language/lams/ApplicationResources.properties

#       lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

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

#       lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

#       lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

#       lams_tool_lamc/web/authoring/BasicContent.jsp

#       lams_tool_lamc/web/authoring/candidateAnswersList.jsp

#       lams_tool_lamc/web/authoring/itemlist.jsp

#       lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

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

#       lams_tool_scratchie/web/pages/learning/learning.jsp

#       lams_tool_scratchie/web/pages/learning/scratchies.jsp

#       lams_tool_scratchie/web/pages/monitoring/summary.jsp

#       lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

#       lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Show less