chore(*): resolving merge issue

ChronosSF · ChronosSF · commit d4bba40c94ba · 2020-03-20T15:09:41.000+02:00
diff --git a/projects/igniteui-angular/src/lib/grids/grid/grid.pipes.ts b/projects/igniteui-angular/src/lib/grids/grid/grid.pipes.ts
@@ -103,7 +103,7 @@ export class IgxGridPagingPipe implements PipeTransform {
         if (!this.gridAPI.grid.paging) {
             return collection;
         }
-        const _perPage = perPage - this.gridAPI.grid.pinnedRecords.length;
+        const _perPage = perPage - this.gridAPI.grid.pinnedRows.length;
         const state = {
             index: page,
             recordsPerPage: _perPage

Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ export class IgxGridPagingPipe implements PipeTransform {`
`103`	`103`	`if (!this.gridAPI.grid.paging) {`
`104`	`104`	`return collection;`
`105`	`105`	`}`
`106`		`- const _perPage = perPage - this.gridAPI.grid.pinnedRecords.length;`
	`106`	`+ const _perPage = perPage - this.gridAPI.grid.pinnedRows.length;`
`107`	`107`	`const state = {`
`108`	`108`	`index: page,`
`109`	`109`	`recordsPerPage: _perPage`