feat(cdk/a11y): fix test errors

BobobUnicorn · BobobUnicorn · commit 541b6e32163b · 2022-08-08T23:55:08.000-04:00
diff --git a/src/cdk/tree/tree.ts b/src/cdk/tree/tree.ts
@@ -553,8 +553,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
`@@ -553,8 +553,6 @@ export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer,`
`553`	`553`	`return this.treeControl?.getChildren ?? this.childrenAccessor;`
`554`	`554`	`}`
`555`	`555`
`556`		`-<<<<<<< HEAD`
`557`		`-<<<<<<< HEAD`
`558`	`556`	`/**`
`559`	`557`	`* Gets the direct children of a node; used for compatibility between the old tree and the`
`560`	`558`	`* new tree.`