From 990d7edba441c3dfb3cc2acabe26b0ecd9e04e17 Mon Sep 17 00:00:00 2001
From: asmsuechan <suenagaryoutaabc@gmail.com>
Date: Tue, 7 Nov 2017 14:44:50 +0900
Subject: [PATCH] Fix some pointed by eslint

---
 browser/lib/markdown.js           | 5 ++---
 browser/lib/markdownTextHelper.js | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/browser/lib/markdown.js b/browser/lib/markdown.js
index 0b2b1171..7a3ae069 100644
--- a/browser/lib/markdown.js
+++ b/browser/lib/markdown.js
@@ -179,11 +179,10 @@ const markdown = {
     const renderedContent = md.render(content)
     return renderedContent
   },
-<<<<<<< HEAD
   strip,
   normalizeLinkText
-=======
->>>>>>> refactor: fix to use cut off file
+    return md.render(content)
+  }
 }
 
 export default markdown
diff --git a/browser/lib/markdownTextHelper.js b/browser/lib/markdownTextHelper.js
index 7510b5bf..1501e2c7 100644
--- a/browser/lib/markdownTextHelper.js
+++ b/browser/lib/markdownTextHelper.js
@@ -35,5 +35,5 @@ export function strip (input) {
 }
 
 export default {
-  strip,
+  strip
 }