resolve merge conflict
diff --git a/src/app/centers/form/form.component.ts b/src/app/centers/form/form.component.ts
index fc987fd..bd1b10d 100644
--- a/src/app/centers/form/form.component.ts
+++ b/src/app/centers/form/form.component.ts
@@ -63,12 +63,6 @@
})
export class CenterFormComponent implements OnInit {
- staffs = [
- {value: '', viewValue: ''},
-
- ];
-
-
offices: Observable<Office[]>;
diff --git a/src/app/collection/collection.component.ts b/src/app/collection/collection.component.ts
index ae55f00..ca932f7 100644
--- a/src/app/collection/collection.component.ts
+++ b/src/app/collection/collection.component.ts
@@ -1,46 +1,11 @@
import {Component, OnInit} from '@angular/core';
-<<<<<<< HEAD
-
import {Store} from '@ngrx/store';
import * as fromRoot from '../store';
import {Observable} from 'rxjs/Observable';
-
-
-
-export interface Office {
- value: string;
- viewValue: string;
-}
-
-export interface Staff {
- value: string;
- viewValue: string;
-}
-
-export interface Center {
- value: string;
- viewValue: string;
-}
-
-export interface Group {
- value: string;
- viewValue: string;
-}
-=======
-import {ActivatedRoute, Params, Router} from '@angular/router';
-import {Employee, Center} from '../services/office/domain/employee.model';
-import {FetchRequest} from '../services/domain/paging/fetch-request.model';
-import {TableData} from '../common/data-table/data-table.component';
-import {Store} from '@ngrx/store';
-import * as fromRoot from '../store';
-import {Observable} from 'rxjs/Observable';
-import {SEARCH} from '../store/employee/employee.actions';
import { Staff } from '../services/domain/center/staff';
import { Office } from '../services/office/domain/office.model';
import { Group } from '../services/domain/group/group';
->>>>>>> 5073d6c9e7f89e3f0f1ee761c12c19ea641afaea
-
-
+import {Center} from '../services/center/domain/center.model'
@Component({
selector: 'fims-collection',
@@ -49,31 +14,6 @@
})
export class CollectionComponent implements OnInit {
- offices: Office[] = [
- {value: '', viewValue: ''},
-
- ];
-
- staffs: Staff[] = [
- {value: '', viewValue: ''},
-
- ];
-
- centers: Center[] = [
- {value: '', viewValue: ''},
-
- ];
-
- groups: Group[] = [
- {value: '', viewValue: ''},
-
- ];
-
-
-
-
-
-
loading$: Observable<boolean>;
staffs: Staff[] = [];
