lams-github

# Conflicts:

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

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

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

#       lams_central/web/includes/javascript/authoring/authoringGeneral.js

#       lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

#       lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

#       lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

#       lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

Show less