Use upstream fix

package.json

@@ -13,7 +13,7 @@
     "file-loader": "^0.8.5",
     "jquery": "^2.2.0",
     "jquery-ui": "^1.10.5",
-    "jupyter-js-services": "^0.12.1",
+    "jupyter-js-services": "^0.12.2",
     "jupyter-js-utils": "^0.4.0",
     "jupyter-js-widgets": "2.0.0-dev.0",
     "marked": "^0.3.5",

src/filebrowser/plugin.ts

@@ -124,14 +124,10 @@ function activateFileBrowser(app: Application, provider: JupyterServices, regist
   app.commands.add([
     {
       id: newTextFileId,
-<<<<<<< HEAD
       handler: () => {
         let icon = `${PORTRAIT_ICON_CLASS} ${TEXTEDITOR_ICON_CLASS}`;
-        fbWidget.createNew('file').then(widget => widget.title.icon = icon);
+        fbWidget.createNew({ type: 'file' }).then(widget => widget.title.icon = icon);
       }
-=======
-      handler: () => fbWidget.createNew({ type: 'file' })
->>>>>>> e8dce4a... Update jupyter-js-services and clean up interfaces
     }
   ]);