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

Merge remote-tracking branch 'remotes/origin/master' into no-image

Browse Source 
# Conflicts:
#	src/app/collection-page/collection-page.module.ts
#	src/app/collection-page/logo/collection-page-logo.component.html
#	src/app/collection-page/logo/collection-page-logo.component.ts
This commit is contained in:
Giuseppe Digilio
2017-06-20 16:07:56 +02:00
parent 5245fd6488 923ad74c2f
commit beec9ea206
72 changed files with 1339 additions and 932 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/app/collection-page/collection-page.module.ts
View File

@@ -5,13 +5,6 @@ import { TranslateModule } from "@ngx-translate/core";
import { SharedModule } from '../shared/shared.module';
import { CollectionPageComponent } from './collection-page.component';
import { FieldWrapperComponent } from './field-wrapper/field-wrapper.component';
import { CollectionPageNameComponent } from './name/collection-page-name.component';
import { CollectionPageLogoComponent } from './logo/collection-page-logo.component';
import { CollectionPageIntroductoryTextComponent } from './introductory-text/collection-page-introductory-text.component';
import { CollectionPageNewsComponent } from './news/collection-page-news.component';
import { CollectionPageCopyrightComponent } from './copyright/collection-page-copyright.component';
import { CollectionPageLicenseComponent } from './license/collection-page-license.component';
import { CollectionPageRoutingModule } from './collection-page-routing.module';
@NgModule({
@@ -23,13 +16,6 @@ import { CollectionPageRoutingModule } from './collection-page-routing.module';
],
declarations: [
CollectionPageComponent,
FieldWrapperComponent,
CollectionPageNameComponent,
CollectionPageLogoComponent,
CollectionPageIntroductoryTextComponent,
CollectionPageNewsComponent,
CollectionPageCopyrightComponent,
CollectionPageLicenseComponent,
]
})
export class CollectionPageModule { }