fix conflicts on master
Project: http://git-wip-us.apache.org/repos/asf/mahout/repo Commit: http://git-wip-us.apache.org/repos/asf/mahout/commit/fcdeef6d Tree: http://git-wip-us.apache.org/repos/asf/mahout/tree/fcdeef6d Diff: http://git-wip-us.apache.org/repos/asf/mahout/diff/fcdeef6d Branch: refs/heads/master Commit: fcdeef6d70042c5433e70f827df11fe79dd274f4 Parents: 165460e f115633 Author: Andrew Palumbo <[email protected]> Authored: Mon Apr 11 04:43:52 2016 -0400 Committer: Andrew Palumbo <[email protected]> Committed: Mon Apr 11 04:43:52 2016 -0400 ---------------------------------------------------------------------- NOTICE.txt | 10 +--------- distribution/pom.xml | 4 ++++ distribution/src/main/assembly/bin.xml | 17 +++++++++++++++++ examples/bin/README.txt | 3 +-- flink/pom.xml | 2 +- pom.xml | 7 +++++++ .../apache/mahout/sparkbindings/blas/package.scala | 5 ++--- .../sparkbindings/test/DistributedSparkSuite.scala | 4 ++-- 8 files changed, 35 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mahout/blob/fcdeef6d/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index 7988e65,488ea12..453e478 --- a/pom.xml +++ b/pom.xml @@@ -118,11 -117,11 +118,18 @@@ <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>
