lams-github

Conflicts:

        lams_build/conf/domain.xml

        lams_build/lib/lams/lams.jar

        lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java

        lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

        lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

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

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/LearningAction.java

        lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

        lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

        lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

        lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

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

        lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

        lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

        lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

        lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

        lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

        lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

        lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

        lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

        lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

        lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.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/action/LearningAction.java

        lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

        lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

        lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

        lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

Show less