From 16a5cf8a52bf56bb3fc0df3442633475c0502d70 Mon Sep 17 00:00:00 2001
From: Nicole Tietz-Sokolskaya <me@ntietz.com>
Date: Mon, 23 Jan 2012 15:39:55 -0500
Subject: [PATCH] Performed merge.

---
 profile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/profile b/profile
index 093a550..34cc543 100644
--- a/profile
+++ b/profile
@@ -42,12 +42,10 @@ export HISTCONTROL=ignoredups
 # disable messaging
 mesg n
 
-<<<<<<< HEAD
 # set the path for Hadoop
 export HADOOP_HOME=~/hadoop/hadoop-0.20.2/
 export PATH=$PATH:$HADOOP_HOME/bin
-=======
+
 # add the rubygem location
 export PATH=$PATH:/var/lib/gems/1.8/bin/ 
->>>>>>> 6fd6398cec6e7bef7c00bef10fdc4ee45a615301