From bbc83883cbd7d6b34f0a798ad0b5427704405001 Mon Sep 17 00:00:00 2001
From: VDyulgerov <volen1999@gmail.com>
Date: Fri, 17 Sep 2021 17:52:40 +0300
Subject: [PATCH] fix(grid): use formattter function for boolean columns #8978

---
 .../src/lib/test-utils/template-strings.spec.ts              | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/projects/igniteui-angular/src/lib/test-utils/template-strings.spec.ts b/projects/igniteui-angular/src/lib/test-utils/template-strings.spec.ts
index 288732250d9..0af0edf9b6c 100644
--- a/projects/igniteui-angular/src/lib/test-utils/template-strings.spec.ts
+++ b/projects/igniteui-angular/src/lib/test-utils/template-strings.spec.ts
@@ -217,12 +217,7 @@ export class ColumnDefinitions {
 
     public static idNameFormatter = `
         <igx-column field="ID" [formatter]="multiplier"></igx-column>
-<<<<<<< HEAD
-<<<<<<< HEAD
         <igx-column field="IsEmployed" [dataType]="'boolean'"></igx-column>
-=======
-        <igx-column field="IsDev" [dataType]="'boolean'"></igx-column>
->>>>>>> 43949224fa (fix(grid): use formattter function for boolean columns #8978)
         <igx-column field="Name"></igx-column>
     `;