hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 23:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into w2p-65240_Community-and-collection-logos

Browse Source 
Conflicts:
	src/app/shared/shared.module.ts
This commit is contained in:
Kristof De Langhe
2020-01-07 16:11:24 +01:00
parent 9df5a508f1 4b67dbf10f
commit 42d12a83ce
367 changed files with 7031 additions and 1766 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/+collection-page/collection-page.module.ts
View File

@@ -8,9 +8,8 @@ import { CollectionPageRoutingModule } from './collection-page-routing.module';
import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
import { CollectionFormComponent } from './collection-form/collection-form.component';
import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
import { SearchService } from '../+search-page/search-service/search.service';
import { CollectionItemMapperComponent } from './collection-item-mapper/collection-item-mapper.component';
import { SearchFixedFilterService } from '../+search-page/search-filters/search-filter/search-fixed-filter.service';
import { SearchService } from '../core/shared/search/search.service';
import { StatisticsModule } from '../statistics/statistics.module';
@NgModule({
@@ -32,7 +31,6 @@ import { StatisticsModule } from '../statistics/statistics.module';
],
providers: [
SearchService,
SearchFixedFilterService
]
})
export class CollectionPageModule {