From 1fd57572edc5e77d3ae131c1f726b436d9cab487 Mon Sep 17 00:00:00 2001
From: ddamiron <ddamiron@sii.fr>
Date: Mon, 22 Jul 2019 10:07:18 +0200
Subject: [PATCH] hotfix conflict
---
src/app/components/index.ts | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/components/index.ts b/src/app/components/index.ts
index 3e5157e..bf1009f 100644
--- a/src/app/components/index.ts
+++ b/src/app/components/index.ts
@@ -6,7 +6,6 @@ import { PaginatorComponent } from './paginator/paginator.component';
import { ResourceDetailComponent } from './resources/detail/resource-detail.component';
import { ResourceFormComponent } from './resources/edit/resource-form.component';
import { ResourcesComponent } from './resources/list/resources.component';
-import { WelcomeComponent } from './welcome/welcome.component';
import { BackButtonComponent } from './back-button/back-button.component';
import { CrudButtonsComponent } from './crud-buttons/crud-buttons.component';
import { FormatsComponent } from './formats/list/formats.component';
@@ -21,6 +20,7 @@ import { LogsSlugsComponent } from './logs-dashboard/logs-slugs/logs-slugs.compo
import { LogsPreReportComponent } from './logs-dashboard/report/logs-pre-report/logs-pre-report.component';
import { LogsReportComponent } from './logs-dashboard/report/logs-report/logs-report.component';
import { LogsHomeComponent } from './logs-dashboard/logs-home/logs-home.component';
+import { PageHeaderComponent } from './page-header/page-header.component';
export {
MenuComponent,
@@ -31,7 +31,6 @@ export {
ResourceDetailComponent,
ResourceFormComponent,
ResourcesComponent,
- WelcomeComponent,
BackButtonComponent,
CrudButtonsComponent,
FormatsComponent,
@@ -46,6 +45,7 @@ export {
LogsPreReportComponent,
LogsReportComponent,
LogsHomeComponent,
+ PageHeaderComponent,
};
// tslint:disable-next-line:variable-name
@@ -58,7 +58,6 @@ export const AppComponents = [
ResourceDetailComponent,
ResourceFormComponent,
ResourcesComponent,
- WelcomeComponent,
BackButtonComponent,
CrudButtonsComponent,
FormatsComponent,
@@ -73,4 +72,5 @@ export const AppComponents = [
LogsPreReportComponent,
LogsReportComponent,
LogsHomeComponent,
+ PageHeaderComponent,
];
--
GitLab