Merge pull request iamacup#58 from realToadtoad/master

iamacup · web-flow · commit 08a00e8bf0a0 · 2020-02-24T21:27:14.000Z
fixed mergestyle linting error
diff --git a/src/index.d.ts b/src/index.d.ts
@@ -75,6 +75,7 @@ export interface MarkdownProps {
   renderer?: AstRenderer;
   markdownit?: MarkdownIt;
   plugins?: Array<PluginContainer<any>>;
+  mergeStyle?: boolean;
 }
 
 type MarkdownStatic = React.ComponentType<MarkdownProps>;

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ export interface MarkdownProps {`
`75`	`75`	`renderer?: AstRenderer;`
`76`	`76`	`markdownit?: MarkdownIt;`
`77`	`77`	`plugins?: Array<PluginContainer<any>>;`
	`78`	`+ mergeStyle?: boolean;`
`78`	`79`	`}`
`79`	`80`
`80`	`81`	`type MarkdownStatic = React.ComponentType<MarkdownProps>;`