diff options
author | Mridul Muralidharan <mridul@gmail.com> | 2013-04-24 09:24:17 +0530 |
---|---|---|
committer | Mridul Muralidharan <mridul@gmail.com> | 2013-04-24 09:24:17 +0530 |
commit | dd515ca3ee011cbf9b6941bb45afc55fd905fda8 (patch) | |
tree | 284b4c31d0d7c8c06b4f78125ddb50037ee50630 /repl-bin/pom.xml | |
parent | adcda84f9646f12e6d5fb4f1e5e3a1b0a98b7c9f (diff) | |
parent | 17e076de800ea0d4c55f2bd657348641f6f9c55b (diff) | |
download | spark-dd515ca3ee011cbf9b6941bb45afc55fd905fda8.tar.gz spark-dd515ca3ee011cbf9b6941bb45afc55fd905fda8.tar.bz2 spark-dd515ca3ee011cbf9b6941bb45afc55fd905fda8.zip |
Attempt at fixing merge conflict
Diffstat (limited to 'repl-bin/pom.xml')
-rw-r--r-- | repl-bin/pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/repl-bin/pom.xml b/repl-bin/pom.xml index 46f38c2772..7a7280313e 100644 --- a/repl-bin/pom.xml +++ b/repl-bin/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.spark-project</groupId> <artifactId>spark-parent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.8.0-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> |