From 802aeead6c2d10ddf22633bf265781b5c4fc4031 Mon Sep 17 00:00:00 2001
From: Shreyas <seekshreyas@gmail.com>
Date: Sun, 2 Mar 2014 00:46:35 -0800
Subject: [PATCH] after infinite merge conflicts

---
 ObidroidLearning.ipynb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ObidroidLearning.ipynb b/ObidroidLearning.ipynb
index 92366b8..e48a201 100644
--- a/ObidroidLearning.ipynb
+++ b/ObidroidLearning.ipynb
@@ -2370,8 +2370,7 @@
       "# setting up the cross validation\n",
       "from sklearn import cross_validation\n",
       "kf = cross_validation.KFold(n_sample, n_folds=3)\n",
-      "\n",
-      "s\n"
+      "\n"
      ],
      "language": "python",
      "metadata": {},