aboutsummaryrefslogtreecommitdiff
path: root/js/panels/css-panel/styles-view-container.reel/styles-view-container.html
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-13 14:03:00 -0700
committerJose Antonio Marquez2012-06-13 14:03:00 -0700
commitefbe5f83157a8dcbcc209c88877d9cd0113d4d20 (patch)
tree50565e097fe4a9db59e554af179f66938fa59f1c /js/panels/css-panel/styles-view-container.reel/styles-view-container.html
parentae90152ae2889a10d44c22e1eeb5bff16cc44a19 (diff)
parent682f4917d6badd105998c3dd84d031c38b51f017 (diff)
downloadninja-efbe5f83157a8dcbcc209c88877d9cd0113d4d20.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
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.html1
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 }