Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
tarelli committed Aug 17, 2016
2 parents 2717773 + 7813aee commit 04629f8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/main/webapp/js/components/ComponentFactory.js
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ define(function (require) {
var simControlsComp = require('jsx!components/dev/simulationcontrols/ExperimentControls');
var cameraControlsComp = require('jsx!./dev/cameracontrols/CameraControls');
var shareComp = require('jsx!./dev/share/share');
var queryComp = require('jsx!./dev/query/query');
//var queryComp = require('jsx!./dev/query/query');

GEPPETTO.ComponentFactory = {
getComponent: function(component, properties){
Expand Down

0 comments on commit 04629f8

Please sign in to comment.