Rebase fixes

12 years ago · cfc45918bb
parent 907bde3b25
commit cfc45918bb
1 changed files with 0 additions and 2 deletions
--- a/IPython/html/static/notebook/js/main.js
+++ b/IPython/html/static/notebook/js/main.js
@ -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,