Commit b5e0ba88 authored by Mattias J Duffy's avatar Mattias J Duffy
Browse files

was not last fix

parent 6b02dc18
......@@ -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;
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