From 11a9e530593d2a0e214b4420c6ce7955a578455c Mon Sep 17 00:00:00 2001
From: James Hensman <james.hensman@gmail.com>
Date: Fri, 12 Apr 2013 22:45:24 +0100
Subject: [PATCH] more manual merging

---
 GPy/examples/dimensionality_reduction.py | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/GPy/examples/dimensionality_reduction.py b/GPy/examples/dimensionality_reduction.py
index 072ae988..0e68e7f7 100644
--- a/GPy/examples/dimensionality_reduction.py
+++ b/GPy/examples/dimensionality_reduction.py
@@ -43,21 +43,12 @@ def BGPLVM(seed=default_seed):
 
     return m
 
-<<<<<<< HEAD
 def GPLVM_oil_100(optimize=True):
     data = GPy.util.datasets.oil_100()
 
     # create simple GP model
     kernel = GPy.kern.rbf(6, ARD = True) + GPy.kern.bias(6)
     m = GPy.models.GPLVM(data['X'], 6, kernel=kernel)
-=======
-def GPLVM_oil_100(optimize=True, M=15):
-    data = GPy.util.datasets.oil_100()
-
-    # create simple GP model
-    kernel = GPy.kern.rbf(6, ARD=True) + GPy.kern.bias(6)
-    m = GPy.models.GPLVM(data['X'], 6, kernel=kernel, M=M)
->>>>>>> f6b98160a7c0ace6ca5f795aeb878d30b8aaf6a4
     m.data_labels = data['Y'].argmax(axis=1)
 
     # optimize