Merge branch 'master' into patch-1

storybookjs · Jun 6, 2017 · afc56fe · afc56fe
2 parents d5753e2 + 64683a1
commit afc56fe
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/addons/info/src/components/Story.js b/addons/info/src/components/Story.js
@@ -90,7 +90,7 @@ export default class Story extends React.Component {
       open: false,
       stylesheet: this.props.styles(JSON.parse(JSON.stringify(stylesheet))),
     };
-    this.marksy = marksy(this.props.mtrcConf);
+    this.marksy = marksy(this.props.marksyConf);
   }
 
   componentWillReceiveProps(nextProps) {