library-mirrors/dat.gui
1
0
Fork 0
mirror of https://github.com/dataarts/dat.gui.git synced 2024-12-12 04:08:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix merge in test.gui.js

Browse Source
This commit is contained in:
Doug Fritz 2014-09-09 13:58:28 -07:00
parent 4fa9fbf381
commit 6fe702d3e1
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/test.gui.js
View File

@ -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-boolean', true );
>>>>>>> 8d86460ebde6d3dda4dec6e7783f0223fca59d00
expectController( 'dat-gui-option', 'hey', [ 'hey', 'hi', 'ho' ] );
expectController( 'dat-gui-option', 'a', { a: 'a', b: 'b', c: 'c' } );