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 /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 'pom.xml')
| -rw-r--r-- | pom.xml | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3,7 +3,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.spark-project</groupId> <artifactId>spark-parent</artifactId> - <version>0.7.1-SNAPSHOT</version> + <version>0.8.0-SNAPSHOT</version> <packaging>pom</packaging> <name>Spark Project Parent POM</name> <url>http://spark-project.org/</url> |