diff options
| author | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
|---|---|---|
| committer | Nivesh Rajbhandari | 2012-06-13 13:51:39 -0700 |
| commit | 263ecfc95bd7eb5c726cd5688c3d74eb10296811 (patch) | |
| tree | 7c907dd58e9b4f4a1d4802d8d22b9c84d3c2edf3 /js/panels/css-panel/styles-view-container.reel/styles-view-container.html | |
| parent | 1bb2778224982aea7b9781c6559bb659983a400f (diff) | |
| parent | a827f2769d75848c0ba0bff03a927c1f2706322b (diff) | |
| download | ninja-263ecfc95bd7eb5c726cd5688c3d74eb10296811.tar.gz | |
Merge branch 'refs/heads/ninja-internal' into PI_HotTextFixes
Conflicts:
js/panels/properties.reel/sections/position-size.reel/position-size.html
Signed-off-by: Nivesh Rajbhandari <mqg734@motorola.com>
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 | } |