From 8ed08b76eef6f1852a6b07cda711925b62c51908 Mon Sep 17 00:00:00 2001
From: MathuraMG <mmg9291@gmail.com>
Date: Thu, 11 Aug 2016 21:29:43 -0400
Subject: [PATCH] fix merge error

---
 client/modules/IDE/pages/IDEView.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/modules/IDE/pages/IDEView.js b/client/modules/IDE/pages/IDEView.js
index 5e89e08d..034863bf 100644
--- a/client/modules/IDE/pages/IDEView.js
+++ b/client/modules/IDE/pages/IDEView.js
@@ -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}
                 />