diff options
| author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
| commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
| tree | 79a88684406d3adf00350246a4da884b97fb0eac /scss/ninja.scss | |
| parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
| parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
| download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz | |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
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"; |