feat(cdk/a11y): fix test errors

BobobUnicorn · BobobUnicorn · commit 1b393d6fd9b3 · 2022-03-24T14:46:52.000-04:00
diff --git a/src/cdk/tree/tree.ts b/src/cdk/tree/tree.ts
@@ -556,8 +556,6 @@ export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer,
     return this.treeControl?.getChildren ?? this.childrenAccessor;
   }
 
-<<<<<<< HEAD
-<<<<<<< HEAD
   /**
    * Gets the direct children of a node; used for compatibility between the old tree and the
    * new tree.

Original file line number	Diff line number	Diff line change
`@@ -556,8 +556,6 @@ export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer,`
`556`	`556`	`return this.treeControl?.getChildren ?? this.childrenAccessor;`
`557`	`557`	`}`
`558`	`558`
`559`		`-<<<<<<< HEAD`
`560`		`-<<<<<<< HEAD`
`561`	`559`	`/**`
`562`	`560`	`* Gets the direct children of a node; used for compatibility between the old tree and the`
`563`	`561`	`* new tree.`