lams-github

# Conflicts:

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

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

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

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

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

#       lams_tool_daco/web/pages/monitoring/listRecords.jsp

#       lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

#       lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

#       lams_tool_images/web/pages/monitoring/imagesummary.jsp

#       lams_tool_laqa/web/monitoring/PrintAnswers.jsp

#       lams_tool_larsrc/web/pages/monitoring/userlist.jsp

#       lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

#       lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

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

#       lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

#       lams_tool_preview/web/pages/monitoring/rubricspart.jsp

#       lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

Show less