diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/components/treeview/ninja-branch.reel/ninja-branch.html | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-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/ninja-branch.reel/ninja-branch.html')
| -rw-r--r-- | js/components/treeview/ninja-branch.reel/ninja-branch.html | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html index 3a3f3658..60894fbc 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.html +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html | |||
| @@ -131,11 +131,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 131 | </script> | 131 | </script> |
| 132 | </head> | 132 | </head> |
| 133 | <body> | 133 | <body> |
| 134 | <div id="branch" class="branch"> | 134 | <div data-montage-id="branch" class="branch"> |
| 135 | <div id="label" class="branch-label"></div> | 135 | <div data-montage-id="label" class="branch-label"></div> |
| 136 | <div id="branchCollapser" class="branchCollapser"> | 136 | <div data-montage-id="branchCollapser" class="branchCollapser"> |
| 137 | <ul id="branchList"> | 137 | <ul data-montage-id="branchList"> |
| 138 | <li id="treeItem"></li> | 138 | <li data-montage-id="treeItem"></li> |
| 139 | </ul> | 139 | </ul> |
| 140 | </div> | 140 | </div> |
| 141 | 141 | ||