From f892dc25da44a40565c53e7377be83b34df55590 Mon Sep 17 00:00:00 2001
From: cbourget <charlesericbourget@gmail.com>
Date: Wed, 13 Feb 2019 11:18:23 -0500
Subject: [PATCH] feat(entity): merge entity module and add an entity-table
 demo

---
 demo/src/app/common/entity-table/entity-table.component.html | 1 -
 projects/common/src/lib/entity/shared/entity.interfaces.ts   | 3 +++
 2 files changed, 3 insertions(+), 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
index 7410bf86ad..5eff48ac3d 100644
--- 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
index fcad938b0a..1ef40c64a5 100644
--- 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) => {