From a718a43d92b2b2b5e84a53c5942c7a1ccd7080ea Mon Sep 17 00:00:00 2001
From: Tianqi Chen <tqchen@users.noreply.github.com>
Date: Fri, 13 Feb 2015 09:04:05 -0800
Subject: [PATCH] Update mushroom.hadoop.conf

---
 multi-node/hadoop/mushroom.hadoop.conf | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/multi-node/hadoop/mushroom.hadoop.conf b/multi-node/hadoop/mushroom.hadoop.conf
index a4e885d54..89b44c009 100644
--- a/multi-node/hadoop/mushroom.hadoop.conf
+++ b/multi-node/hadoop/mushroom.hadoop.conf
@@ -31,9 +31,6 @@ data = stdin
 model_out = stdout 
 # split pattern of xgboost
 dsplit = row
-
-<<<<<<< HEAD
 # evaluate on training data as well each round
 eval_train = 1
-=======
->>>>>>> df3f87c182cc12ccc9ac1f9cafbe01ea7ebf0ac4
+