diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/components/treeview/branch.reel | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/components/treeview/branch.reel')
| -rw-r--r-- | js/components/treeview/branch.reel/branch.html | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/js/components/treeview/branch.reel/branch.html b/js/components/treeview/branch.reel/branch.html index 97b03382..d3060d96 100644 --- a/js/components/treeview/branch.reel/branch.html +++ b/js/components/treeview/branch.reel/branch.html | |||
| @@ -129,11 +129,11 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 129 | </script> | 129 | </script> |
| 130 | </head> | 130 | </head> |
| 131 | <body> | 131 | <body> |
| 132 | <div id="branch" class="branch"> | 132 | <div data-montage-id="branch" class="branch"> |
| 133 | <span id="label" class="branch-label"></span> | 133 | <span data-montage-id="label" class="branch-label"></span> |
| 134 | 134 | ||
| 135 | <ul id="branchList"> | 135 | <ul data-montage-id="branchList"> |
| 136 | <li id="treeItem"></li> | 136 | <li data-montage-id="treeItem"></li> |
| 137 | </ul> | 137 | </ul> |
| 138 | </div> | 138 | </div> |
| 139 | </body> | 139 | </body> |