diff options
| author | Eric Guzman | 2012-05-10 14:51:31 -0700 |
|---|---|---|
| committer | Eric Guzman | 2012-05-10 14:51:31 -0700 |
| commit | 39f23ad4868482f395d2e210490a2d73545a9d84 (patch) | |
| tree | c702d67585f72cddf55932411e7100133bc58452 /js/panels/Timeline/Span.reel | |
| parent | 733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff) | |
| parent | 632a53278826a33506b302b573ee0681840f2d6c (diff) | |
| download | ninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz | |
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts:
js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/panels/Timeline/Span.reel')
| -rw-r--r-- | js/panels/Timeline/Span.reel/Span.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/js/panels/Timeline/Span.reel/Span.html b/js/panels/Timeline/Span.reel/Span.html index 3d3aef1b..8baa141a 100644 --- a/js/panels/Timeline/Span.reel/Span.html +++ b/js/panels/Timeline/Span.reel/Span.html | |||
| @@ -22,7 +22,7 @@ | |||
| 22 | </head> | 22 | </head> |
| 23 | <body> | 23 | <body> |
| 24 | 24 | ||
| 25 | <div id="spanspace" class="tween_span"> | 25 | <div data-montage-id="spanspace" class="tween_span"> |
| 26 | </div> | 26 | </div> |
| 27 | 27 | ||
| 28 | </body> | 28 | </body> |