Merge branch 'master' of github.com:Glavin001/atom-beautify

2015-05-18 15:52:48 -03:00 · 2015-05-18 15:52:48 -03:00 · 2c04729e5c
parent de405880fd 49570d9e02
commit 2c04729e5c
2 changed files with 3 additions and 2 deletions
--- a/examples/simple-jsbeautifyrc/tss/expected/random_indent.tss
+++ b/examples/simple-jsbeautifyrc/tss/expected/random_indent.tss
@ -94,4 +94,4 @@
  font: {
    fontSize: 16
  }
-}
+}
--- a/src/languages/jsx.coffee
+++ b/src/languages/jsx.coffee
@ -9,6 +9,7 @@ module.exports = {
    ###
    grammars: [
        "JSX"
+        "JavaScript (JSX)"
    ]

    ###
@ -18,4 +19,4 @@ module.exports = {
        "jsx"
    ]

-}
+}