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

did not properly merge shim

Browse Source
This commit is contained in:
Doug Fritz 2014-09-09 13:46:22 -07:00
parent 2f825b790e
commit df7c8c160f
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
elements/shim.js
View File

@ -1,14 +1,7 @@
// Use gui.shim.js in production when you want to use dat.gui to recall values without any of the interface.
( function( scope ) {
<<<<<<< HEAD
'use strict';
||||||| merged common ancestors
'use strict';
=======
>>>>>>> 8d86460ebde6d3dda4dec6e7783f0223fca59d00
var Gui = function() {
this.vars = {};