lams-github

# Conflicts:

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

#       lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

#       lams_tool_lamc/build.properties

#       lams_tool_lamc/db/sql/create_lams_tool_mc.sql

#       lams_tool_lamc/db/sql/tool_insert.sql

#       lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java

#       lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java

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

#       lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/MonitoringController.java

#       lams_tool_lamc/web/403.jsp

#       lams_tool_lamc/web/404.jsp

#       lams_tool_lamc/web/WEB-INF/web.xml

#       lams_tool_lamc/web/common/taglibs.jsp

#       lams_tool_lamc/web/error.jsp

#       lams_tool_lamc/web/login.jsp

Show less