From 65162e0ec3ce3c9a6ea3a38e2e13f2e19b091dbb 2014-11-15 16:51:54
From: Jonathan Frederic <jdfreder@calpoly.edu>
Date: 2014-11-15 16:51:54
Subject: [PATCH] Rebase fixes

---

diff --git a/IPython/html/static/notebook/js/main.js b/IPython/html/static/notebook/js/main.js
index 41870ba..6c4a6a6 100644
--- 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,