was not last fix

b5e0ba88 · Mattias J Duffy · 6b02dc18 · b5e0ba88
Commit b5e0ba88 authored Sep 27, 2017 by Mattias J Duffy
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

src/reducers/ui.js src/reducers/ui.js +0 -6

No files found.
--- a/src/reducers/ui.js
+++ b/src/reducers/ui.js
@@ -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;