diff options
| author | Eric Guzman | 2012-02-13 15:48:37 -0800 |
|---|---|---|
| committer | Eric Guzman | 2012-02-13 15:48:37 -0800 |
| commit | b2672478decd3ee3bfacf86b525551c997f9604d (patch) | |
| tree | 79a88684406d3adf00350246a4da884b97fb0eac /js/components/treeview/ninja-leaf.reel/ninja-leaf.html | |
| parent | a738121a921e4c721b280434952b415b9ab3b1a8 (diff) | |
| parent | 0620e2f788861e824d6e49fa319da4d20b18a556 (diff) | |
| download | ninja-b2672478decd3ee3bfacf86b525551c997f9604d.tar.gz | |
Merge branch 'refs/heads/master' into StylesControllerUpdates
Conflicts:
js/controllers/styles-controller.js
Diffstat (limited to 'js/components/treeview/ninja-leaf.reel/ninja-leaf.html')
| -rw-r--r-- | js/components/treeview/ninja-leaf.reel/ninja-leaf.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html index bd8e8acd..310274bc 100644 --- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.html +++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.html | |||
| @@ -37,7 +37,7 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot | |||
| 37 | </head> | 37 | </head> |
| 38 | <body> | 38 | <body> |
| 39 | <div id="leaf" class="leaf"> | 39 | <div id="leaf" class="leaf"> |
| 40 | <div id="label" class="leaf-label"></div> | 40 | <div id="label" class="leaf-label" draggable="true"></div> |
| 41 | </div> | 41 | </div> |
| 42 | </body> | 42 | </body> |
| 43 | </html> \ No newline at end of file | 43 | </html> \ No newline at end of file |