multiple rebases fixed

This commit is contained in:
Peter Cottle 2012-12-19 16:08:29 -08:00
parent 26c04c7e0e
commit 41429e0ce6
3 changed files with 32 additions and 11 deletions

View file

@ -1,5 +1,6 @@
var _ = require('underscore');
var Backbone = require('backbone');
// horrible hack to get localStorage Backbone plugin
var Backbone = (!require('../util').isBrowser()) ? Backbone = require('backbone') : Backbone = window.Backbone;
var CommandEntryCollection = require('../models/collections').CommandEntryCollection;
var Main = require('../app');