feat(entity): merge entity module and add an entity-table demo

infra-geo-ouverte · Feb 22, 2019 · f892dc2 · f892dc2
1 parent 863d849
commit f892dc2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/demo/src/app/common/entity-table/entity-table.component.html b/demo/src/app/common/entity-table/entity-table.component.html
@@ -4,7 +4,6 @@
   <mat-card-content>
     See the <a href="https://github.com/infra-geo-ouverte/igo2-lib/tree/master/demo/src/app/common/entity-table">code of this example</a>
   </mat-card-content>
-
   <igo-entity-table
     [store]="store"
     [template]="template">

diff --git a/projects/common/src/lib/entity/shared/entity.interfaces.ts b/projects/common/src/lib/entity/shared/entity.interfaces.ts
@@ -59,7 +59,10 @@ export interface EntityOperationState {
 export interface EntityTableTemplate {
   columns: EntityTableColumn[];
   selection?: boolean;
+<<<<<<< HEAD
   selectMany?: boolean;
+=======
+>>>>>>> feat(entity): merge entity module and add an entity-table demo
   sort?: boolean;
   valueAccessor?: (entity: object, property: string) => any;
   rowClassFunc?: (entity: object) => {