diff options
| author | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
|---|---|---|
| committer | Jonathan Duran | 2012-05-09 09:58:27 -0700 |
| commit | 48a2a800155fd2d608fb7191c0180cd8f625cd44 (patch) | |
| tree | 899f9cf1b09a01bc073f92ab498236aed80b38ec /js/components/layout/documents-tab.reel/documents-tab.html | |
| parent | 2ea8a62835f4c20efff2623306e7205e6f5bf0ba (diff) | |
| parent | d220c02e246b30509b28a47fa04916ca2b8122e4 (diff) | |
| download | ninja-48a2a800155fd2d608fb7191c0180cd8f625cd44.tar.gz | |
Merge branch 'refs/heads/NINJAmaster' into TimelineUber
Conflicts:
js/panels/Timeline/TimelineTrack.reel/TimelineTrack.html
Signed-off-by: Jonathan Duran <jduran@motorola.com>
Diffstat (limited to 'js/components/layout/documents-tab.reel/documents-tab.html')
| -rwxr-xr-x | js/components/layout/documents-tab.reel/documents-tab.html | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/js/components/layout/documents-tab.reel/documents-tab.html b/js/components/layout/documents-tab.reel/documents-tab.html index 1516a8ce..4aed23d9 100755 --- a/js/components/layout/documents-tab.reel/documents-tab.html +++ b/js/components/layout/documents-tab.reel/documents-tab.html | |||
| @@ -69,9 +69,9 @@ | |||
| 69 | </head> | 69 | </head> |
| 70 | 70 | ||
| 71 | <body> | 71 | <body> |
| 72 | <div id="openDocumentsTabComponent" class="documentsTab"> | 72 | <div data-montage-id="openDocumentsTabComponent" class="documentsTab"> |
| 73 | <ul id="openDocuments" class="openDocuments"> | 73 | <ul data-montage-id="openDocuments" class="openDocuments"> |
| 74 | <li id="document"></li> | 74 | <li data-montage-id="document"></li> |
| 75 | </ul> | 75 | </ul> |
| 76 | </div> | 76 | </div> |
| 77 | </body> | 77 | </body> |