fix rebase issue

mmalerba · mmalerba · commit 1e395ed9d0c7 · 2019-12-13T13:51:02.000-08:00
diff --git a/src/material/checkbox/checkbox.ts b/src/material/checkbox/checkbox.ts
@@ -496,5 +496,5 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc
   static ngAcceptInputType_disabled: BooleanInput;
   static ngAcceptInputType_required: BooleanInput;
   static ngAcceptInputType_disableRipple: BooleanInput;
-  static ngAcceptInputType_indeterminate: boolean | string | null | undefined;
+  static ngAcceptInputType_indeterminate: BooleanInput;
 }

Original file line number	Diff line number	Diff line change
`@@ -496,5 +496,5 @@ export class MatCheckbox extends _MatCheckboxMixinBase implements ControlValueAc`
`496`	`496`	`static ngAcceptInputType_disabled: BooleanInput;`
`497`	`497`	`static ngAcceptInputType_required: BooleanInput;`
`498`	`498`	`static ngAcceptInputType_disableRipple: BooleanInput;`
`499`		`- static ngAcceptInputType_indeterminate: boolean \| string \| null \| undefined;`
	`499`	`+ static ngAcceptInputType_indeterminate: BooleanInput;`
`500`	`500`	`}`