deleted erronous line

Author: domix

application.properties

@@ -4,6 +4,5 @@ app.version=0.1
 app.servlet.version=2.4
 app.grails.version=1.1-RC1
 plugins.code-coverage=1.1.3
->>>>>>> remotes/domix/master:application.properties
 plugins.hibernate=1.1-RC1
 app.name=grain