diff options
| author | hwc487 | 2012-07-09 16:08:02 -0700 |
|---|---|---|
| committer | hwc487 | 2012-07-09 16:08:02 -0700 |
| commit | 5085d0f67df89a21715308956004164597a6ba79 (patch) | |
| tree | 2c896163143a66331205a39b0a3b1b45d51bf12a /js/components/treeview/ninja-branch.reel/ninja-branch.html | |
| parent | 51f1691f792dbda9b740ded8aa0457c9406db156 (diff) | |
| parent | 84b3327bd92faafab7954b5eb64c7abe24a3fe13 (diff) | |
| download | ninja-5085d0f67df89a21715308956004164597a6ba79.tar.gz | |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into GridFixes
Conflicts:
js/helper-classes/3D/StageLine.js
Diffstat (limited to 'js/components/treeview/ninja-branch.reel/ninja-branch.html')
| -rw-r--r-- | js/components/treeview/ninja-branch.reel/ninja-branch.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/treeview/ninja-branch.reel/ninja-branch.html b/js/components/treeview/ninja-branch.reel/ninja-branch.html index 52cd97b4..54f2f0d7 100644 --- a/js/components/treeview/ninja-branch.reel/ninja-branch.html +++ b/js/components/treeview/ninja-branch.reel/ninja-branch.html | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | <!DOCTYPE html> | 1 | <!doctype html> |
| 2 | <!-- <copyright> | 2 | <!-- <copyright> |
| 3 | Copyright (c) 2012, Motorola Mobility, Inc | 3 | Copyright (c) 2012, Motorola Mobility, Inc |
| 4 | All Rights Reserved. | 4 | All Rights Reserved. |
| @@ -160,9 +160,9 @@ POSSIBILITY OF SUCH DAMAGE. | |||
| 160 | <div data-montage-id="branchCollapser" class="branchCollapser"> | 160 | <div data-montage-id="branchCollapser" class="branchCollapser"> |
| 161 | <ul data-montage-id="branchList"> | 161 | <ul data-montage-id="branchList"> |
| 162 | <li data-montage-id="treeItem"></li> | 162 | <li data-montage-id="treeItem"></li> |
| 163 | </ul> | 163 | </ul> |
| 164 | </div> | 164 | </div> |
| 165 | 165 | ||
| 166 | </div> | 166 | </div> |
| 167 | </body> | 167 | </body> |
| 168 | </html> | 168 | </html> |