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 97277ed + a891f92 commit 2717773
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/main/webapp/js/components/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ define(function(require) {
utils = require('./utils');

require('./ComponentFactory')(GEPPETTO);
require('./ComponentsInitialization_OSB')(GEPPETTO);
//require('./ComponentsInitialization_OSB')(GEPPETTO);
//require('./ComponentsInitialization_VFB')(GEPPETTO);
//require('./ComponentsInitialization')(GEPPETTO);
require('./ComponentsInitialization')(GEPPETTO);

var command = "Project.loadFromURL";
var simParam = utils.getQueryStringParameter('load_project_from_url');
Expand Down

0 comments on commit 2717773

Please sign in to comment.