mobile / YH_RNComponent · Commits

Go to a project

Authored by yoho-js001
Commit d05ae0305231929c91c4406ea4d7239482aeb5a4 1 parent 26aa724c

Fix conflict.

Inline Side-by-side
Showing 1 changed file with 0 additions and 2 deletions
@@ -17,8 +17,6 @@ import LoadMoreIndicator from '../../../common/components/LoadMoreIndicator'; @@ -17,8 +17,6 @@ import LoadMoreIndicator from '../../../common/components/LoadMoreIndicator';
17 import Immutable, {Map} from 'immutable'; 17 import Immutable, {Map} from 'immutable';
18 import RecommendCell from './RecommendCell' 18 import RecommendCell from './RecommendCell'
19 import BrandProductMoreFilter from '../../../brandStore/components/brandStore/brandStoreSubView/Cells/BrandProductMoreFilter'; 19 import BrandProductMoreFilter from '../../../brandStore/components/brandStore/brandStoreSubView/Cells/BrandProductMoreFilter';
20 -import ProductCategoryList from '../../../brandStore/components/brandStore/brandStoreSubView/Cells/ProductCategoryList';  
21 -import BrandProductFilter from '../../../brandStore/components/brandStore/brandStoreSubView/Cells/BrandProductFilter';  
22 import BrandProductListCell from '../../../common/components/ListCell/ProductListCell'; 20 import BrandProductListCell from '../../../common/components/ListCell/ProductListCell';
23 import NewArrivalFilter from './NewArrivalFilter' 21 import NewArrivalFilter from './NewArrivalFilter'
24 import NewArrivalCategoryList from './NewArrivalCategoryList' 22 import NewArrivalCategoryList from './NewArrivalCategoryList'