Resolve toolbar

4494be7f · Luke Bennett · 4c672e9f · 4494be7f
Commit 4494be7f authored Jan 11, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 9 deletions

app/assets/javascripts/vue_shared/components/markdown/toolbar.vue ...ts/javascripts/vue_shared/components/markdown/toolbar.vue +0 -9

No files found.
--- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
@@ -16,15 +16,6 @@
        return this.quickActionsDocsPath !== '';
      },
    },
-<<<<<<< HEAD
-
-=======
-    computed: {
-      hasQuickActionsDocsPath() {
-        return this.quickActionsDocsPath !== '';
-      },
-    },
->>>>>>> upstream/master
  };
 </script>