diff options
| author | Jon Reid | 2012-05-15 11:24:53 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-05-15 11:24:53 -0700 |
| commit | 3e02135df2ee028ae43d0e2456c04e24ecee0e86 (patch) | |
| tree | d6dcab6756e3da0038a39527cfe0f9ca89e92310 /imports/codemirror/mode/properties/properties.css | |
| parent | 53a604d0ccb1315576b94406cf3b0b958162307b (diff) | |
| parent | e33a4e58c271a9507082694a5268b840fdd05968 (diff) | |
| download | ninja-3e02135df2ee028ae43d0e2456c04e24ecee0e86.tar.gz | |
Merge branch 'timeline-local' into timeline-multiselect
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
resolved using theirs. (selectLayers)
Diffstat (limited to 'imports/codemirror/mode/properties/properties.css')
| -rwxr-xr-x | imports/codemirror/mode/properties/properties.css | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/imports/codemirror/mode/properties/properties.css b/imports/codemirror/mode/properties/properties.css deleted file mode 100755 index d975375c..00000000 --- a/imports/codemirror/mode/properties/properties.css +++ /dev/null | |||
| @@ -1,3 +0,0 @@ | |||
| 1 | span.cm-key {color: #00c;} | ||
| 2 | span.cm-equals {color: #a11;} | ||
| 3 | span.cm-value {color: #170;} | ||