Incremented build number [GLBUILDER]

diff --git a/org.gridsite.core/project/version.properties b/org.gridsite.core/project/version.properties
index 28eade6..ad167ef 100644 (file)
--- a/org.gridsite.core/project/version.properties
+++ b/org.gridsite.core/project/version.properties
@@ -1,4 +1,7 @@
-#Tue Nov 02 02:04:57 CET 2004
+#Tue Nov 02 11:59:34 CET 2004
 module.version=1.0.4
-module.build=7
+>>>>>>>=1.7
+module.build=27
+<<<<<<<=version.properties
+=\=\=\=\=\=\=
 module.age=5