Authored by yoho-js001

Fix conflict.

... ... @@ -17,8 +17,6 @@ import LoadMoreIndicator from '../../../common/components/LoadMoreIndicator';
import Immutable, {Map} from 'immutable';
import RecommendCell from './RecommendCell'
import BrandProductMoreFilter from '../../../brandStore/components/brandStore/brandStoreSubView/Cells/BrandProductMoreFilter';
import ProductCategoryList from '../../../brandStore/components/brandStore/brandStoreSubView/Cells/ProductCategoryList';
import BrandProductFilter from '../../../brandStore/components/brandStore/brandStoreSubView/Cells/BrandProductFilter';
import BrandProductListCell from '../../../common/components/ListCell/ProductListCell';
import NewArrivalFilter from './NewArrivalFilter'
import NewArrivalCategoryList from './NewArrivalCategoryList'
... ...