fix(cdk/tree): fix merge conflict errors

Author: BobobUnicorn

src/cdk/tree/padding.ts

@@ -81,13 +81,7 @@ export class CdkTreeNodePadding<T, K = T> implements OnDestroy {
   /** The padding indent value for the tree node. Returns a string with px numbers if not null. */
   _paddingIndent(): string | null {
     const nodeLevel =
-<<<<<<< HEAD
-      this._treeNode.data && this._tree.treeControl?.getLevel
-        ? this._tree.treeControl.getLevel(this._treeNode.data)
-        : null;
-=======
       (this._treeNode.data && this._tree._getLevelAccessor()?.(this._treeNode.data)) ?? null;
->>>>>>> 660691b17 (implement the various expansion-related methods)
     const level = this._level == null ? nodeLevel : this._level;
     return typeof level === 'number' ? `${level * this._indent}${this.indentUnits}` : null;
   }

src/cdk/tree/toggle.ts

@@ -35,13 +35,8 @@ export class CdkTreeNodeToggle<T, K = T> {
 
   _toggle(event: Event): void {
     this.recursive
-<<<<<<< HEAD
-      ? this._tree.treeControl?.toggleDescendants(this._treeNode.data)
-      : this._tree.treeControl?.toggle(this._treeNode.data);
-=======
       ? this._tree.toggleDescendants(this._treeNode.data)
       : this._tree.toggle(this._treeNode.data);
->>>>>>> 660691b17 (implement the various expansion-related methods)
 
     event.stopPropagation();
   }

src/cdk/tree/tree.ts

@@ -43,13 +43,12 @@ import {CdkTreeNodeDef, CdkTreeNodeOutletContext} from './node';
 import {CdkTreeNodeOutlet} from './outlet';
 import {
   getMultipleTreeControlsError,
-  getTreeControlFunctionsMissingError,
   getTreeControlMissingError,
   getTreeMissingMatchingNodeDefError,
   getTreeMultipleDefaultNodeDefsError,
   getTreeNoValidDataSourceError,
 } from './tree-errors';
-import {BooleanInput, coerceNumberProperty} from '@angular/cdk/coercion';
+import {coerceNumberProperty} from '@angular/cdk/coercion';
 
 function coerceObservable<T>(data: T | Observable<T>): Observable<T> {
   if (!isObservable(data)) {
@@ -418,7 +417,8 @@ export class CdkTree<T, K = T> implements AfterContentChecked, CollectionViewer,
   }
 
   /**
-   * Expand the data node and all its descendants. If they are already expanded, does nothing. */
+   * Expand the data node and all its descendants. If they are already expanded, does nothing.
+   */
   expandDescendants(dataNode: T): void {
     if (this.treeControl) {
       this.treeControl.expandDescendants(dataNode);