[core] Fix merge conflict between #26954 and #26874

mui · Jun 27, 2021 · c646b13 · c646b13
1 parent b65c802
commit c646b13
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/test/utils/describeConformanceV5.js b/test/utils/describeConformanceV5.js
@@ -25,7 +25,7 @@ import {
  * @property {Array<keyof typeof fullSuite>} [skip] - Skip the specified tests
  * @property {string} [testComponentsRootPropWith] - The host component that should be rendered instead.
  * @property {{ slotName: string, slotClassName: string }} [testDeepOverrides]
- * @property {{ prop?: string, value?: string, styleKey: string }} [testStateOverrides]
+ * @property {{ prop?: string, value?: any, styleKey: string }} [testStateOverrides]
  * @property {object} [testVariantProps]
  */