diff options
| author | Patrick Wendell <pwendell@gmail.com> | 2013-12-16 21:56:21 -0800 |
|---|---|---|
| committer | Patrick Wendell <pwendell@gmail.com> | 2013-12-16 21:56:21 -0800 |
| commit | c1fec89895f03dbdbb6f445ea3cdcd2d050555c4 (patch) | |
| tree | 7fa506c519fe94af1af392db38e3c0ae4c9c45b6 /pom.xml | |
| parent | 24f8220dc8a0671df7ee32b3eb193120ca316878 (diff) | |
| download | spark-c1fec89895f03dbdbb6f445ea3cdcd2d050555c4.tar.gz spark-c1fec89895f03dbdbb6f445ea3cdcd2d050555c4.tar.bz2 spark-c1fec89895f03dbdbb6f445ea3cdcd2d050555c4.zip | |
Cleanup
Diffstat (limited to 'pom.xml')
| -rw-r--r-- | pom.xml | 6 |
1 files changed, 0 insertions, 6 deletions
@@ -220,7 +220,6 @@ <version>0.3.1</version> </dependency> <dependency> -<<<<<<< HEAD <groupId>${akka.group}</groupId> <artifactId>akka-actor_${scala.binary.version}</artifactId> <version>${akka.version}</version> @@ -254,13 +253,8 @@ </exclusions> </dependency> <dependency> -<<<<<<< HEAD <groupId>${akka.group}</groupId> <artifactId>akka-zeromq_${scala.binary.version}</artifactId> -======= - <groupId>org.spark-project.akka</groupId> - <artifactId>akka-zeromq_2.10</artifactId> ->>>>>>> Attempt with extra repositories <version>${akka.version}</version> <exclusions> <exclusion> |