zhangbo1_wd

解决冲突

1 -  
2 export { PageViewModel } from "./viewmodel/PageViewModel" 1 export { PageViewModel } from "./viewmodel/PageViewModel"
3 2
4 export { EmptyComponent } from "./components/view/EmptyComponent" 3 export { EmptyComponent } from "./components/view/EmptyComponent"
5 -export { DemoPreviewerComponent} from "./components/DemoPreviewerComponent"  
6 4
7 -export { EmptyComponent } from "./components/EmptyComponent" 5 +export { DemoPreviewerComponent } from "./components/DemoPreviewerComponent"
8 6
9 export { ErrorComponent } from "./components/view/ErrorComponent" 7 export { ErrorComponent } from "./components/view/ErrorComponent"
10 8
1 { 1 {
2 "src": [ 2 "src": [
3 "components/DemoPreviewerComponent", 3 "components/DemoPreviewerComponent",
4 - "components/SmallVideoCardComponent" 4 + "components/view/SmallVideoCardComponent"
5 ] 5 ]
6 } 6 }