lams-github

Conflicts:

        lams_central/conf/language/lams/ApplicationResources_en_AU.properties

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

        lams_tool_assessment/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/service/McService.java

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

        lams_tool_lamc/web/authoring/candidateAnswersList.jsp

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

Show less