Resolve markdown

93b95eac · Luke Bennett · 7f5422f3 · 93b95eac
Commit 93b95eac authored Jan 11, 2018 by Luke Bennett
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/javascripts/notebook/cells/markdown.vue app/assets/javascripts/notebook/cells/markdown.vue +0 -4

No files found.
--- a/app/assets/javascripts/notebook/cells/markdown.vue
+++ b/app/assets/javascripts/notebook/cells/markdown.vue
@@ -93,12 +93,8 @@
    <prompt />
    <div
      class="markdown"
-<<<<<<< HEAD
      v-html="markdown"
    >
-=======
-      v-html="markdown">
->>>>>>> upstream/master
    </div>
  </div>
 </template>