diff options
| author | Hossein Falaki <falaki@gmail.com> | 2014-01-07 21:28:26 -0800 |
|---|---|---|
| committer | Hossein Falaki <falaki@gmail.com> | 2014-01-07 21:28:26 -0800 |
| commit | 46cb980a5f5ba55f341b8bcce4f0d1e5213989d3 (patch) | |
| tree | ff3823085f27c0f4477d25a056d333c429c5d6c9 /repl/pom.xml | |
| parent | 150089dae12bbba693db4edbfcea360b443637df (diff) | |
| parent | b2e690f839e7ee47f405135d35170173386c5d13 (diff) | |
| download | spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.tar.gz spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.tar.bz2 spark-46cb980a5f5ba55f341b8bcce4f0d1e5213989d3.zip | |
Fixed merge conflict
Diffstat (limited to 'repl/pom.xml')
| -rw-r--r-- | repl/pom.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/repl/pom.xml b/repl/pom.xml index b0e7877bbb..2dfe7ac900 100644 --- a/repl/pom.xml +++ b/repl/pom.xml @@ -127,7 +127,6 @@ <environmentVariables> <SPARK_HOME>${basedir}/..</SPARK_HOME> <SPARK_TESTING>1</SPARK_TESTING> - <SPARK_CLASSPATH>${spark.classpath}</SPARK_CLASSPATH> </environmentVariables> </configuration> </plugin> |