diff options
| author | Prashant Sharma <prashant.s@imaginea.com> | 2013-07-15 11:29:45 +0530 |
|---|---|---|
| committer | Prashant Sharma <prashant.s@imaginea.com> | 2013-07-15 11:29:45 +0530 |
| commit | 27250914290da28bf2b95253419ba94f57dd482c (patch) | |
| tree | 2e9398a098e8029f48dff2aa1e6c977412987647 | |
| parent | a1e56a43b3bc7ed66cbf5d5cee9d5bc12b029f0d (diff) | |
| download | spark-27250914290da28bf2b95253419ba94f57dd482c.tar.gz spark-27250914290da28bf2b95253419ba94f57dd482c.tar.bz2 spark-27250914290da28bf2b95253419ba94f57dd482c.zip | |
Fixed previously left out merge conflict in scripts
| -rwxr-xr-x | run | 4 |
1 files changed, 0 insertions, 4 deletions
@@ -131,9 +131,5 @@ else # The JVM doesn't read JAVA_OPTS by default so we need to pass it in EXTRA_ARGS="$JAVA_OPTS" fi -<<<<<<< HEAD -exec "$RUNNER" -cp "$CLASSPATH" $EXTRA_ARGS "$@" -======= exec "$RUNNER" -cp "$CLASSPATH" $EXTRA_ARGS "$@" ->>>>>>> 4698a0d6886905ef21cbd52e108d0dcab3df12df |