Repository: mahout Updated Branches: refs/heads/master 4a917824f -> b725255ad
fix conflict on root pom Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/b725255a Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/b725255a Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/b725255a Branch: refs/heads/master Commit: b725255ad6414fc89b6a7276c86995fa7183f14c Parents: 4a91782 Author: Andrew Palumbo <[email protected]> Authored: Mon Apr 11 04:52:41 2016 -0400 Committer: Andrew Palumbo <[email protected]> Committed: Mon Apr 11 04:52:41 2016 -0400 ---------------------------------------------------------------------- pom.xml | 7 ------- 1 file changed, 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/b725255a/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 453e478..7988e65 100644 --- a/pom.xml +++ b/pom.xml @@ -118,18 +118,11 @@ <mscala.version>3.2.0</mscala.version> <hbase.version>1.0.0</hbase.version> <lucene.version>4.6.1</lucene.version> -<<<<<<< Temporary merge branch 1 - <slf4j.version>1.7.12</slf4j.version> - <scala.compat.version>2.10</scala.compat.version> - <scala.version>2.10.4</scala.version> - <spark.version>1.5.2</spark.version> -======= <slf4j.version>1.7.19</slf4j.version> <scala.compat.version>2.10</scala.compat.version> <scala.version>2.10.4</scala.version> <spark.version>1.5.2</spark.version> <flink.version>1.0.1</flink.version> ->>>>>>> Temporary merge branch 2 <h2o.version>0.1.25</h2o.version> </properties> <issueManagement>
