Fixed bad merge conflict resolution

d57ad991 · Phil Hughes · cb0b32d7 · d57ad991
Commit d57ad991 authored Mar 16, 2017 by Phil Hughes
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/javascripts/boards/filtered_search_boards.js app/assets/javascripts/boards/filtered_search_boards.js +1 -1

No files found.
--- a/app/assets/javascripts/boards/filtered_search_boards.js
+++ b/app/assets/javascripts/boards/filtered_search_boards.js
@@ -2,7 +2,7 @@
 import FilteredSearchContainer from '../filtered_search/container';
 export default class FilteredSearchBoards extends gl.FilteredSearchManager {
-  constructor(store, updateUrl = false, canEdit = []) {
+  constructor(store, updateUrl = false, cantEdit = []) {
    super('boards');
    this.store = store;