Merge branch 'refs/heads/master' into CSSPanelUpdates

Conflicts:
	js/panels/PanelContainer/PanelContainer.reel/PanelContainer.js

3 files changed, 1 insertions, 1 deletions

diff --git a/imports/codemirror/mode/rpm/spec/index.html b/imports/codemirror/mode/rpm/spec/index.html
index e3bca152..e3bca152 100755..100644
--- a/imports/codemirror/mode/rpm/spec/index.html
+++ b/imports/codemirror/mode/rpm/spec/index.html
diff --git a/imports/codemirror/mode/rpm/spec/spec.css b/imports/codemirror/mode/rpm/spec/spec.css
index d0a5d430..d0a5d430 100755..100644
--- a/imports/codemirror/mode/rpm/spec/spec.css
+++ b/imports/codemirror/mode/rpm/spec/spec.css
diff --git a/imports/codemirror/mode/rpm/spec/spec.js b/imports/codemirror/mode/rpm/spec/spec.js
index 3b5c08c9..902db6ae 100755..100644
--- a/imports/codemirror/mode/rpm/spec/spec.js
+++ b/imports/codemirror/mode/rpm/spec/spec.js
@@ -14,7 +14,7 @@ CodeMirror.defineMode("spec", function(config, modeConfig) {
         return {
           controlFlow: false,
           macroParameters: false,
-          section: false,
+          section: false
         };
     },
     token: function (stream, state) {