From 9f3d9eaa647793d91e8f3fd99a8decb94fce2aed Mon Sep 17 00:00:00 2001
From: Stephen Whitworth <stephenjameswhitworth@gmail.com>
Date: Tue, 6 May 2014 23:13:02 +0100
Subject: [PATCH] Update linear_regression.go

Removing merge conflict.
---
 lm/linear_regression.go | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/lm/linear_regression.go b/lm/linear_regression.go
index b238c5f..03e24e6 100644
--- a/lm/linear_regression.go
+++ b/lm/linear_regression.go
@@ -1,12 +1 @@
 package lm
-
-<<<<<<< HEAD
-import base "golearn/base"
-
-type LinearModel struct {
-	base.BaseEstimator
-=======
-type LinearModel struct {
-	// base.BaseRegressor
->>>>>>> 798751c839ea79f6dff13e790f80a4d5bcbfea68
-}