mirror of
https://github.com/pcottle/learnGitBranching.git
synced 2025-06-27 08:28:50 +02:00
multiple rebases fixed
This commit is contained in:
parent
26c04c7e0e
commit
41429e0ce6
3 changed files with 32 additions and 11 deletions
|
@ -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');
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue