Ate Douma pushed to branch feature/translations-psp1 at cms / hippo-cms
Commits:
dc5a6c8a by Ate Douma at 2016-02-15T21:38:58+01:00
CMS-16 fix merge errors
- - - - -
1 changed file:
- pom.xml
Changes:
=====================================
pom.xml
=====================================
--- a/pom.xml
+++ b/pom.xml
@@ -86,11 +86,11 @@
<!-- use root project name for all project modules NOTICE files, should be
the same as in the root NOTICE file -->
<notice.project.name>Hippo CMS</notice.project.name>
- <hippo.commons.version>2.2.0-SNAPSHOT</hippo.commons.version>
- <hippo.frontend.theme.version>2.2.0-SNAPSHOT</hippo.frontend.theme.version>
- <hippo.utilities.version>2.2.0-SNAPSHOT</hippo.utilities.version>
- <hippo.services.version>2.2.0-SNAPSHOT</hippo.services.version>
- <hippo.repository.version>3.2.0-SNAPSHOT</hippo.repository.version>
+ <hippo.commons.version>3.0.0-SNAPSHOT</hippo.commons.version>
+ <hippo.frontend.theme.version>3.0.0-SNAPSHOT</hippo.frontend.theme.version>
+ <hippo.utilities.version>3.0.0-SNAPSHOT</hippo.utilities.version>
+ <hippo.services.version>3.0.0-SNAPSHOT</hippo.services.version>
+
<hippo.repository.version>4.0.0-translations-psp1-SNAPSHOT</hippo.repository.version>
<!-- Test dependencies -->
<easymock.version>2.4</easymock.version>
View it on GitLab:
https://code.onehippo.org/cms/hippo-cms/commit/dc5a6c8aefcfe01a4e000f5f2d9d8658298cbb79
_______________________________________________
Hippocms-svn mailing list
Hippocms-svn@lists.onehippo.org
https://lists.onehippo.org/mailman/listinfo/hippocms-svn
