ODIn/spark-instrumented-optimizer
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixed previously left out merge conflict in scripts

Browse source
This commit is contained in:
Prashant Sharma 2013-07-15 11:29:45 +05:30
parent a1e56a43b3
commit 2725091429
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
run
View file

@ -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