Accept merge-conflicted baseline (#42398)

weswigham · web-flow · commit 621e0afe0013 · 2021-01-18T07:05:11.000-08:00
diff --git a/tests/baselines/reference/jsxLibraryManagedAttributesUnusedGeneric.types b/tests/baselines/reference/jsxLibraryManagedAttributesUnusedGeneric.types
@@ -33,7 +33,7 @@ namespace jsx {
 >css : string
 
         export type LibraryManagedAttributes<C, P> = WithCSSProp<P>
->LibraryManagedAttributes : WithCSSProp<P>
+>LibraryManagedAttributes : LibraryManagedAttributes<C, P>
 
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ namespace jsx {`
`33`	`33`	`>css : string`
`34`	`34`
`35`	`35`	`export type LibraryManagedAttributes<C, P> = WithCSSProp<P>`
`36`		`->LibraryManagedAttributes : WithCSSProp<P>`
	`36`	`+>LibraryManagedAttributes : LibraryManagedAttributes<C, P>`
`37`	`37`
`38`	`38`	`}`
`39`	`39`	`}`