Resolve sidebar_subscriptions

4c1988b5 · Luke Bennett · 3f5e3233 · 4c1988b5
Commit 4c1988b5 authored Jan 11, 2018 by Luke Bennett
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue ...idebar/components/subscriptions/sidebar_subscriptions.vue +0 -6

No files found.
--- a/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
+++ b/app/assets/javascripts/sidebar/components/subscriptions/sidebar_subscriptions.vue
@@ -20,17 +20,11 @@ export default {
      store: new Store(),
    };
  },
-<<<<<<< HEAD

  created() {
    eventHub.$on('toggleSubscription', this.onToggleSubscription);
  },

-=======
-  created() {
-    eventHub.$on('toggleSubscription', this.onToggleSubscription);
-  },
->>>>>>> upstream/master
  beforeDestroy() {
    eventHub.$off('toggleSubscription', this.onToggleSubscription);
  },