chore(*): Resolve merge conflicts.

MKirova · MKirova · commit 011e14f86d0b · 2022-01-07T15:08:44.000+02:00
diff --git a/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss b/projects/igniteui-angular/src/lib/core/styles/components/grid/_grid-theme.scss
@@ -2980,7 +2980,7 @@
 
     %igx-grid__tr-header-row {
         igx-pivot-row-dimension-header-group {
-            igx-grid-header {
+            igx-pivot-row-dimension-header {
                 align-items: center;
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -2980,7 +2980,7 @@`
`2980`	`2980`
`2981`	`2981`	`%igx-grid__tr-header-row {`
`2982`	`2982`	`igx-pivot-row-dimension-header-group {`
`2983`		`- igx-grid-header {`
	`2983`	`+ igx-pivot-row-dimension-header {`
`2984`	`2984`	`align-items: center;`
`2985`	`2985`	`}`
`2986`	`2986`	`}`