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 | |
| 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')
| -rw-r--r-- | repl/pom.xml | 2 | ||||
| -rw-r--r-- | repl/src/main/scala/spark/repl/SparkILoop.scala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/repl/pom.xml b/repl/pom.xml index 1f885673f4..038da5d988 100644 --- a/repl/pom.xml +++ b/repl/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> diff --git a/repl/src/main/scala/spark/repl/SparkILoop.scala b/repl/src/main/scala/spark/repl/SparkILoop.scala index cd7b5128b2..23556dbc8f 100644 --- a/repl/src/main/scala/spark/repl/SparkILoop.scala +++ b/repl/src/main/scala/spark/repl/SparkILoop.scala @@ -200,7 +200,7 @@ class SparkILoop(in0: Option[BufferedReader], val out: PrintWriter, val master: ____ __ / __/__ ___ _____/ /__ _\ \/ _ \/ _ `/ __/ '_/ - /___/ .__/\_,_/_/ /_/\_\ version 0.7.1 + /___/ .__/\_,_/_/ /_/\_\ version 0.8.0 /_/ """) import Properties._ |