Fix broken merge

1ee57cbd · Michael Droettboom · 7a496116 · 1ee57cbd
Commit 1ee57cbd authored Feb 14, 2019 by Michael Droettboom
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 6 deletions

src/pyodide.js src/pyodide.js +1 -6

No files found.
--- a/src/pyodide.js
+++ b/src/pyodide.js
@@ -370,13 +370,8 @@ var languagePluginLoader = new Promise((resolve, reject) => {
    document.getElementsByTagName('head')[0].appendChild(link);

    // Add a custom output handler for Python objects
-<<<<<<< HEAD
-    self.iodide.addOutputHandler({
-      shouldHandle : (val) => {
-=======
-    window.iodide.addOutputRenderer({
+    self.iodide.addOutputRenderer({
      shouldRender : (val) => {
->>>>>>> Update for new Iodide renderer API
        return (typeof val === 'function' &&
                pyodide._module.PyProxy.isPyProxy(val));
      },