Commit d57ad991 authored by Phil Hughes's avatar Phil Hughes

Fixed bad merge conflict resolution

parent cb0b32d7
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment