nicole/config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Performed merge.

Browse source
This commit is contained in:
Nicole Tietz-Sokolskaya 2012-01-23 15:39:55 -05:00
parent 201b63434e
commit 16a5cf8a52
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
profile
View file

@ -42,12 +42,10 @@ export HISTCONTROL=ignoredups
# disable messaging # disable messaging
mesg n mesg n
<<<<<<< HEAD
# set the path for Hadoop # set the path for Hadoop
export HADOOP_HOME=~/hadoop/hadoop-0.20.2/ export HADOOP_HOME=~/hadoop/hadoop-0.20.2/
export PATH=$PATH:$HADOOP_HOME/bin export PATH=$PATH:$HADOOP_HOME/bin
=======
# add the rubygem location # add the rubygem location
export PATH=$PATH:/var/lib/gems/1.8/bin/ export PATH=$PATH:/var/lib/gems/1.8/bin/
>>>>>>> 6fd6398cec6e7bef7c00bef10fdc4ee45a615301