diff options
| author | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
|---|---|---|
| committer | Armen Kesablyan | 2012-05-08 16:43:43 -0700 |
| commit | dc075ffcc6dd03c090d90fad999eee9b924d56ee (patch) | |
| tree | 867f8bdd588c8f9076979233ca46a688ff70523e /js/panels/Timeline/PropertyTrack.reel | |
| parent | 5d7e470351fd150d5e70a97332fa2f2553797499 (diff) | |
| parent | 4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff) | |
| download | ninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz | |
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts:
js/components/layout/tools-properties.reel/tools-properties.html
Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/panels/Timeline/PropertyTrack.reel')
| -rw-r--r-- | js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html index 2af78f9a..a4b598c5 100644 --- a/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html +++ b/js/panels/Timeline/PropertyTrack.reel/PropertyTrack.html | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | </head> | 22 | </head> |
| 23 | <body> | 23 | <body> |
| 24 | 24 | ||
| 25 | <div id="property-track" class="timeline-track"></div> | 25 | <div data-montage-id="property-track" class="timeline-track"></div> |
| 26 | 26 | ||
| 27 | </body> | 27 | </body> |
| 28 | </html> \ No newline at end of file | 28 | </html> \ No newline at end of file |