lams-github

Conflicts:

        lams_admin/conf/language/lams/ApplicationResources.properties

        lams_build/3rdParty.userlibraries

        lams_build/build.xml

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

        lams_central/web/includes/javascript/openUrls.js

        lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

        lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200326.sql

        lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java

        lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java

        lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java

        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_tool_assessment/conf/language/lams/ApplicationResources.properties

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

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

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

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

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

        lams_tool_assessment/web/pages/learning/learning.jsp

        lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

        lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java

        lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

        lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql

        lams_tool_lamc/web/tblmonitoring/mcq.jsp

        lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

        lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

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

        lams_tool_scratchie/web/pages/learning/scratchies.jsp

        lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

        lams_www/web/news.html

Show less