diff options
author | Eric Guzman | 2012-02-13 10:30:26 -0800 |
---|---|---|
committer | Eric Guzman | 2012-02-13 10:30:26 -0800 |
commit | 672e6f61647b1b8a5f6f5831284fa44bcb7be883 (patch) | |
tree | 0c15656f1f82f194bfcab68634a88f68fd3d42cb /scss/ninja.scss | |
parent | 586c3f7bbea04e62638e5ed8cdce9933e88c0b67 (diff) | |
parent | e142611e22718b1f1d1696902ad9161ec5f33f98 (diff) | |
download | ninja-672e6f61647b1b8a5f6f5831284fa44bcb7be883.tar.gz |
Merge branch 'refs/heads/master' into PresetsPanel
Diffstat (limited to 'scss/ninja.scss')
-rwxr-xr-x | scss/ninja.scss | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scss/ninja.scss b/scss/ninja.scss index 1061780a..002ab8e8 100755 --- a/scss/ninja.scss +++ b/scss/ninja.scss | |||
@@ -35,6 +35,7 @@ | |||
35 | body { | 35 | body { |
36 | } | 36 | } |
37 | 37 | ||
38 | |||
38 | // Codemirror | 39 | // Codemirror |
39 | //@import "imports/codemirror/_codemirror"; | 40 | //@import "imports/codemirror/_codemirror"; |
40 | //@import "imports/codemirror/_javascript"; | 41 | //@import "imports/codemirror/_javascript"; |