fixing last merge conflict

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

Showing with 0 additions and 4 deletions

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

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