lams-github

# Conflicts:

#       idea_project/.idea/runConfigurations/WildFly.xml

#       lams_tool_assessment/lams_tool_assessment.eml

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

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

#       lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Show less