lams-github

# Conflicts:

#       lams_admin/web/WEB-INF/tags/PageLearner.tag

#       lams_central/web/WEB-INF/tags/PageLearner.tag

#       lams_central/web/includes/javascript/rating5.js

#       lams_gradebook/web/WEB-INF/tags/PageLearner.tag

#       lams_learning/web/WEB-INF/tags/PageLearner.tag

#       lams_learning/web/css/components-learner.scss

#       lams_monitoring/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_assessment/web/pages/learning/results/essay.jsp

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

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

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

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

#       lams_tool_chat/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_daco/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_doku/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_forum/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_images/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_images/web/pages/learning/parts/commentsarea.jsp

#       lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_leader/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_nb/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_preview/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_survey/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_task/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_vote/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag

#       lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag

#       lams_www/web/WEB-INF/tags/PageLearner.tag

Show less