fix merge error

This commit is contained in:
MathuraMG 2016-08-11 21:29:43 -04:00
parent cd1a803123
commit 8ed08b76ee

View file

@ -173,6 +173,7 @@ class IDEView extends React.Component {
fontSize={this.props.preferences.fontSize}
indentationAmount={this.props.preferences.indentationAmount}
isTabIndent={this.props.preferences.isTabIndent}
files={this.props.files}
lintMessages={this.props.editorAccessibility.lintMessages}
lineNo={this.props.editorAccessibility.lineNo}
/>