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
6b02dc18
Commit
6b02dc18
authored
Sep 27, 2017
by
Mattias J Duffy
Browse files
fixing last merge conflict
parent
98b12aad
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/reducers/ui.js
View file @
6b02dc18
<<<<<<<
HEAD
import
{
TOGGLE_DRAWER
,
SET_SIDEBAR
,
SET_SEARCH_TERM
}
from
'
../actions/action-types
'
=======
import
{
TOGGLE_DRAWER
,
SET_SIDEBAR
,
SET_SEARCH_TERM
,
SET_FILTERED_LIST
,
ADD_FAVORITE_FACILITY
,
REMOVE_FAVORITE_FACILITY
}
from
'
../actions/action-types
'
>>>>>>>
c3abe9389ebadac8437111d3fa63f4ac278bb160
function
isOpen
(
state
=
false
,
action
){
switch
(
action
.
type
)
{
...
...
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