aboutsummaryrefslogtreecommitdiff
path: root/js/components/treeview/leaf.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-08 16:43:43 -0700
committerArmen Kesablyan2012-05-08 16:43:43 -0700
commitdc075ffcc6dd03c090d90fad999eee9b924d56ee (patch)
tree867f8bdd588c8f9076979233ca46a688ff70523e /js/components/treeview/leaf.reel
parent5d7e470351fd150d5e70a97332fa2f2553797499 (diff)
parent4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff)
downloadninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/treeview/leaf.reel')
-rw-r--r--js/components/treeview/leaf.reel/leaf.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/components/treeview/leaf.reel/leaf.html b/js/components/treeview/leaf.reel/leaf.html
index 360b85a9..a644d4f9 100644
--- a/js/components/treeview/leaf.reel/leaf.html
+++ b/js/components/treeview/leaf.reel/leaf.html
@@ -34,8 +34,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
34 </script> 34 </script>
35</head> 35</head>
36<body> 36<body>
37 <div id="leaf" class="leaf"> 37 <div data-montage-id="leaf" class="leaf">
38 <span id="label" class="leaf-label"></span> 38 <span data-montage-id="label" class="leaf-label"></span>
39 </div> 39 </div>
40</body> 40</body>
41</html> \ No newline at end of file 41</html> \ No newline at end of file