Author: gsingers
Date: Thu Oct 6 18:38:17 2011
New Revision: 1179755
URL: http://svn.apache.org/viewvc?rev=1179755&view=rev
Log:
fix bin/mahout
Modified:
mahout/trunk/bin/mahout
Modified: mahout/trunk/bin/mahout
URL:
http://svn.apache.org/viewvc/mahout/trunk/bin/mahout?rev=1179755&r1=1179754&r2=1179755&view=diff
==============================================================================
--- mahout/trunk/bin/mahout (original)
+++ mahout/trunk/bin/mahout Thu Oct 6 18:38:17 2011
@@ -210,15 +210,7 @@ if [ "$HADOOP_HOME" = "" ] || [ "$MAHOUT
echo $CLASSPATH
;;
(*)
-<<<<<<< HEAD
-<<<<<<< HEAD
CLASSPATH=$CLASSPATH exec "$JAVA" $JAVA_HEAP_MAX $MAHOUT_OPTS $CLASS "$@"
-=======
- exec "$JAVA" $JAVA_HEAP_MAX $MAHOUT_OPTS -classpath "$CLASSPATH" $CLASS
"$@"
->>>>>>> b2289f420c0702f4ceeb5e1488c0977cd70f5f89
-=======
- CLASSPATH=$CLASSPATH exec "$JAVA" $JAVA_HEAP_MAX $MAHOUT_OPTS $CLASS "$@"
->>>>>>> 998503d2d2897f1c7c661584237b487edc8ef4a9
esac
else
echo "Running on hadoop, using HADOOP_HOME=$HADOOP_HOME"
