Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
SRCT
whats-open-web
Commits
b5e0ba88
Commit
b5e0ba88
authored
Sep 27, 2017
by
Mattias J Duffy
Browse files
was not last fix
parent
6b02dc18
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/reducers/ui.js
View file @
b5e0ba88
...
...
@@ -59,14 +59,8 @@ const favorites = (state = [], action) => {
const
ui
=
(
state
=
{},
action
)
=>
({
drawer
:
drawer
(
state
.
drawer
,
action
),
<<<<<<<
HEAD
sidebar
:
sidebar
(
state
.
sidbar
,
action
),
search
:
search
(
state
.
search
,
action
),
})
=======
sidebar
:
sidebar
(
state
.
sidebar
,
action
),
search
:
search
(
state
.
search
,
state
.
facilities
,
action
),
favorites
:
favorites
(
state
.
favorites
,
action
),
});
>>>>>>>
c3abe9389ebadac8437111d3fa63f4ac278bb160
export
default
ui
;
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment