From 6fe702d3e1a10255ae8bfbe533019ab9b853fb78 Mon Sep 17 00:00:00 2001
From: Doug Fritz <dougfritz@google.com>
Date: Tue, 9 Sep 2014 13:58:28 -0700
Subject: [PATCH] fix merge in test.gui.js

---
 tests/test.gui.js | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/tests/test.gui.js b/tests/test.gui.js
index 6ce9647..2e1c6c5 100644
--- a/tests/test.gui.js
+++ b/tests/test.gui.js
@@ -30,22 +30,10 @@ describe( 'Gui', function() {
 
     it( 'picks the right controller for the job', function() {
 
-<<<<<<< HEAD
-        expectController( 'controller-number', 1234 );
-        expectController( 'controller-string', 'string value' );
-        expectController( 'controller-function', function() {} );
-        expectController( 'controller-boolean', true );
-||||||| merged common ancestors
-        expectController( 'controller-number', 1234 );
-        expectController( 'controller-string', 'string value' );
-        expectController( 'controller-function', function(){} );
-        expectController( 'controller-boolean', true );
-=======
         expectController( 'dat-gui-number', 1234 );
         expectController( 'dat-gui-string', 'string value' );
-        expectController( 'dat-gui-function', function(){} );
+        expectController( 'dat-gui-function', function() {} );
         expectController( 'dat-gui-boolean', true );
->>>>>>> 8d86460ebde6d3dda4dec6e7783f0223fca59d00
 
         expectController( 'dat-gui-option', 'hey', [ 'hey', 'hi', 'ho' ] );
         expectController( 'dat-gui-option', 'a', { a: 'a', b: 'b', c: 'c' } );