Resolve conflict in board_list.vue.

7f11bc35 · Marin Jankovski · f64e65b5 · 7f11bc35
Commit 7f11bc35 authored Feb 07, 2018 by Marin Jankovski
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

app/assets/ja app/assets/ja +0 -4

No files found.
--- a/app/assets/javascripts/boards/components/board_list.vue
+++ b/app/assets/javascripts/boards/components/board_list.vue
@@ -159,11 +159,7 @@ export default {
      this.showIssueForm = !this.showIssueForm;
    },
    onScroll() {
-<<<<<<< HEAD:app/assets/javascripts/boards/components/board_list.vue
-      if (!this.list.loadingMore && (this.scrollTop() > this.scrollHeight() - this.scrollOffset)) {
-=======
      if (!this.loadingMore && (this.scrollTop() > this.scrollHeight() - this.scrollOffset)) {
->>>>>>> upstream/master:app/assets/javascripts/boards/components/board_list.vue
        this.loadNextPage();
      }
    },