diff options
| author | Ananya Sen | 2012-02-22 12:18:25 -0800 |
|---|---|---|
| committer | Ananya Sen | 2012-02-22 12:18:25 -0800 |
| commit | dbf0ca5637a3bca87c21c65ada47f8a4d794f78c (patch) | |
| tree | ace2a2415ef14662c27cdb2528914bef0a7f9208 /js/components/layout/document-entry.reel/document-entry.html | |
| parent | 9aa442da1ac9fd3212b37fa63a36090af47b6808 (diff) | |
| parent | 27589634d3e8ea52abe8623f8f2cc48ce0aa04c9 (diff) | |
| download | ninja-dbf0ca5637a3bca87c21c65ada47f8a4d794f78c.tar.gz | |
Merge branch 'refs/heads/FileIO-jose' into FileIO
Conflicts:
js/controllers/document-controller.js
Signed-off-by: Ananya Sen <Ananya.Sen@motorola.com>
Diffstat (limited to 'js/components/layout/document-entry.reel/document-entry.html')
| -rwxr-xr-x | js/components/layout/document-entry.reel/document-entry.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/js/components/layout/document-entry.reel/document-entry.html b/js/components/layout/document-entry.reel/document-entry.html index ba17449a..1cf01737 100755 --- a/js/components/layout/document-entry.reel/document-entry.html +++ b/js/components/layout/document-entry.reel/document-entry.html | |||
| @@ -26,7 +26,6 @@ | |||
| 26 | <body> | 26 | <body> |
| 27 | <li id="documentEntry" class="documentEntry"> | 27 | <li id="documentEntry" class="documentEntry"> |
| 28 | <div id="isActive"></div> | 28 | <div id="isActive"></div> |
| 29 | <div id="dirtyFlag"></div> | ||
| 30 | <span id="name"></span> | 29 | <span id="name"></span> |
| 31 | <img src="js/components/layout/document-entry.reel/close_button.gif"> | 30 | <img src="js/components/layout/document-entry.reel/close_button.gif"> |
| 32 | </li> | 31 | </li> |