diff options
| author | Jon Reid | 2012-06-15 10:10:41 -0700 |
|---|---|---|
| committer | Jon Reid | 2012-06-15 10:10:41 -0700 |
| commit | 526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7 (patch) | |
| tree | 65939e59615aaa10a7db77211e71616ad531bd0e /js/panels/css-panel/styles-view-container.reel/styles-view-container.html | |
| parent | b5b760ee82e5cc4da176914983a6002cbf86c11a (diff) | |
| parent | 5ee0c89fa0c7acc280ff3b884767e8513fd0b315 (diff) | |
| download | ninja-526ac54f73d53e1e2a3d6a4dbf4f9992c143baf7.tar.gz | |
Merge remote-tracking branch 'ninja-internal/master' into test-merge
Conflicts:
js/panels/Timeline/TimelinePanel.reel/TimelinePanel.js
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.js
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 | } |