lams-github

Conflicts:

        lams_build/3rdParty.userlibraries

        lams_central/conf/language/lams/ApplicationResources_en_AU.properties

        lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

        lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

        lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

        lams_central/web/qb/collection.jsp

        lams_central/web/questions/questionFile.jsp

        lams_common/db/sql/create_lams_11_tables.sql

        lams_common/db/sql/insert_lams_config_data.sql

        lams_common/db/sql/insert_types_data.sql

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

        lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

        lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

        lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

        lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

        lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

        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/model/McContent.java

        lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

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

        lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

        lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag

        lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

        lams_tool_lamc/web/WEB-INF/tags/Rating.tag

        lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

        lams_tool_lamc/web/authoring/candidateAnswersList.jsp

        lams_tool_lamc/web/authoring/itemlist.jsp

        lams_tool_scratchie/web/pages/authoring/basic.jsp

        lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Show less