new commit
new commit
Merge branch 'master' of github.com:CreationTech/GrailsGitIntegration

Conflicts:
	grails-app/views/hom/index.gsp
Merge branch 'master' of github.com:CreationTech/GrailsGitIntegration

Conflicts:
	target/classes/test/HomController.class
	target/stacktrace.log
Merge branch 'master' of github.com:CreationTech/GrailsGitIntegration

Conflicts:
	grails-app/controllers/test/HomController.groovy
	grails-app/views/hom/index.gsp
	target-eclipse/classes/.gitignore
	target-eclipse/classes/ApplicationResources.class
	target-eclipse/classes/BuildConfig.class
	target-eclipse/classes/Config.class
	target-eclipse/classes/DataSource$_run_closure3_closure4_closure7.class
	target-eclipse/classes/DataSource.class
	target-eclipse/classes/DefaultCacheConfig.class
	target-eclipse/classes/DefaultSecurityConfig.class
	target-eclipse/classes/DefaultWebXmlConfig.class
	target-eclipse/classes/JQueryConfig.class
	target-eclipse/classes/JQueryPluginResources.class
	target-eclipse/classes/JQueryResourceTagLib.class
	target-eclipse/classes/JQueryTagLib.class
	target-eclipse/classes/resources.class
	target/classes/test/HomController.class
	target/stacktrace.log