lams-github

# Conflicts:

#       lams_admin/conf/language/lams/ApplicationResources.properties

#       lams_build/build_base.xml

#       lams_build/lib/lams/lams.jar

#       lams_central/web/WEB-INF/struts-config.xml

#       lams_common/build.xml

#       lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

#       lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

Show less