From 8c368eeb073243d1caa1b60b0b5dfb2ab3577df9 Mon Sep 17 00:00:00 2001
From: Grant Nestor <grantnestor@gmail.com>
Date: Thu, 14 Jun 2018 10:30:04 -0700
Subject: [PATCH 1/3] Upgrade marked

---
 bower.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bower.json b/bower.json
index b4b41affe..043cb6815 100644
--- a/bower.json
+++ b/bower.json
@@ -13,7 +13,7 @@
     "jquery": "components/jquery#~3.3",
     "jquery-typeahead": "~2.0.0",
     "jquery-ui": "components/jqueryui#~1.10",
-    "marked": "~0.3",
+    "marked": "~0.4",
     "MathJax": "components/MathJax#~2.6",
     "moment": "~2.19.3",
     "preact": "https://unpkg.com/preact@^7.2.0/dist/preact.min.js",

From 6670d57e2f3f3cb0c4d9ac22ec7c02e6c9770959 Mon Sep 17 00:00:00 2001
From: Grant Nestor <grantnestor@gmail.com>
Date: Fri, 15 Jun 2018 13:09:06 -0700
Subject: [PATCH 2/3] Update tests

---
 notebook/tests/notebook/markdown.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/notebook/tests/notebook/markdown.js b/notebook/tests/notebook/markdown.js
index 314747630..c552ae076 100644
--- a/notebook/tests/notebook/markdown.js
+++ b/notebook/tests/notebook/markdown.js
@@ -96,11 +96,11 @@ casper.notebook_test(function () {
     };
 
     var codeblock = '```\nx = 1\n```'
-    var result = '<pre><code>x = 1\n</code></pre>'
+    var result = '<pre><code>x = 1</code></pre>'
     md_render_test(codeblock, result, 'Markdown code block no language');
 
     codeblock = '```aaaa\nx = 1\n```'
-    result = '<pre><code class="cm-s-ipython language-aaaa">x = 1\n</code></pre>'
+    result = '<pre><code class="cm-s-ipython language-aaaa">x = 1</code></pre>'
     md_render_test(codeblock, result, 'Markdown code block unknown language');
 
     function mathjax_render_test(input_string, result, message){

From 2ca36840036c84ca705d3b53bc478af3aa30c7a2 Mon Sep 17 00:00:00 2001
From: Grant Nestor <grantnestor@gmail.com>
Date: Fri, 15 Jun 2018 15:31:21 -0700
Subject: [PATCH 3/3] Update selenium tests

---
 notebook/tests/selenium/test_markdown.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/notebook/tests/selenium/test_markdown.py b/notebook/tests/selenium/test_markdown.py
index 7ff04efea..db4a44c9b 100644
--- a/notebook/tests/selenium/test_markdown.py
+++ b/notebook/tests/selenium/test_markdown.py
@@ -20,8 +20,8 @@ def test_markdown_cell(notebook):
     expected_contents = ['<h1 id="Foo">Foo<a class="anchor-link" href="#Foo">¶</a></h1>',
                          '<p><strong>Bar</strong></p>',
                          '<p><em>Baz</em></p>', 
-                         '<pre><code>x = 1\n</code></pre>',
-                         '<pre><code class="cm-s-ipython language-aaaa">x = 1\n</code></pre>'
+                         '<pre><code>x = 1</code></pre>',
+                         '<pre><code class="cm-s-ipython language-aaaa">x = 1</code></pre>'
                          ]
     nb.append(*cell_text, cell_type="markdown")
     nb.run_all()