diff options
| author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
|---|---|---|
| committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
| commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
| tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/panels/css-panel/styles-view-container.reel/styles-view-container.html | |
| parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
| parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
| download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz | |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/panels/css-panel/styles-view-container.reel/styles-view-container.html')
| -rw-r--r-- | js/panels/css-panel/styles-view-container.reel/styles-view-container.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/panels/css-panel/styles-view-container.reel/styles-view-container.html b/js/panels/css-panel/styles-view-container.reel/styles-view-container.html index 93ac3793..150f20fa 100644 --- a/js/panels/css-panel/styles-view-container.reel/styles-view-container.html +++ b/js/panels/css-panel/styles-view-container.reel/styles-view-container.html | |||
| @@ -16,7 +16,6 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 16 | "element" : {"#" : "container"}, | 16 | "element" : {"#" : "container"}, |
| 17 | "ruleListContainer": {"@": "ruleListContainer" }, | 17 | "ruleListContainer": {"@": "ruleListContainer" }, |
| 18 | "computedStyleView": {"@": "computedStyleView" }, | 18 | "computedStyleView": {"@": "computedStyleView" }, |
| 19 | "substitution": {"@": "substitution" }, | ||
| 20 | "delegate": {"@": "stylesViewDelegate"}, | 19 | "delegate": {"@": "stylesViewDelegate"}, |
| 21 | "toolbar": {"@": "toolbar"} | 20 | "toolbar": {"@": "toolbar"} |
| 22 | } | 21 | } |