fix(grid): use formattter function for boolean columns #8978

IgniteUI · Sep 27, 2021 · bbc8388 · bbc8388
1 parent 65510d3
commit bbc8388
Showing 1 changed file with 0 additions and 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
@@ -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>
     `;