##// END OF EJS Templates
Rebase fixes
Jonathan Frederic -
Show More
@@ -2,7 +2,6 b''
2 // Distributed under the terms of the Modified BSD License.
2 // Distributed under the terms of the Modified BSD License.
3
3
4 require([
4 require([
5 'es6promise',
6 'base/js/namespace',
5 'base/js/namespace',
7 'jquery',
6 'jquery',
8 'notebook/js/notebook',
7 'notebook/js/notebook',
@@ -26,7 +25,6 b' require(['
26 // only loaded, not used, please keep sure this is loaded last
25 // only loaded, not used, please keep sure this is loaded last
27 'custom/custom'
26 'custom/custom'
28 ], function(
27 ], function(
29 es6promise,
30 IPython,
28 IPython,
31 $,
29 $,
32 notebook,
30 notebook,
General Comments 0
You need to be logged in to leave comments. Login now