Rebase fixes

This commit is contained in:
Jonathan Frederic 2014-11-14 18:02:50 -08:00
parent 907bde3b25
commit cfc45918bb

View File

@ -2,7 +2,6 @@
// Distributed under the terms of the Modified BSD License.
require([
'es6promise',
'base/js/namespace',
'jquery',
'notebook/js/notebook',
@ -26,7 +25,6 @@ require([
// only loaded, not used, please keep sure this is loaded last
'custom/custom'
], function(
es6promise,
IPython,
$,
notebook,