chore(*): Fixes merge conflicts from master

Author: 3phase

projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss

@@ -1076,10 +1076,6 @@
         opacity: .5;
     }
 
-    %igx-grid__tr--disabled {
-        opacity: .5;
-    }
-
     %grid-row--odd {
         background: --var($theme, 'row-odd-background');
         color: --var($theme, 'row-odd-text-color');

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

@@ -5153,17 +5153,6 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
         return this.pinnedRows.map(row => row.rowData);
     }
 
-    /**
-     * Returns the currently transformed paged/filtered/sorted/grouped pinned data, displayed in the grid.
-     * @example
-     * ```typescript
-     *      const pinnedDataView = this.grid.pinnedDataView;
-     * ```
-     */
-    get pinnedDataView(): any[] {
-        return this.pinnedRows.map(row => row.rowData);
-    }
-
     /**
      * Get current selection state.
      * @example