aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
diff options
context:
space:
mode:
authorEric Guzman2012-05-10 14:51:31 -0700
committerEric Guzman2012-05-10 14:51:31 -0700
commit39f23ad4868482f395d2e210490a2d73545a9d84 (patch)
treec702d67585f72cddf55932411e7100133bc58452 /js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
parent733e16b55a6de807cdbb60b0f2cea36fc1619fd4 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-39f23ad4868482f395d2e210490a2d73545a9d84.tar.gz
Merge branch 'refs/heads/master' into CSSPanelUpdates
Conflicts: js/panels/CSSPanel/ComputedStyleSubPanel.reel/ComputedStyleSubPanel.html
Diffstat (limited to 'js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html')
-rw-r--r--js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
index 47778b5d..54944e5d 100644
--- a/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
+++ b/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
@@ -22,8 +22,8 @@
22 </head> 22 </head>
23 <body> 23 <body>
24 24
25 <div id="trackspace"> 25 <div data-montage-id="trackspace">
26 <div id="track_spacer" class="trackspacer"></div> 26 <div data-montage-id="track_spacer" class="trackspacer"></div>
27 </div> 27 </div>
28 28
29 </body> 29 </body>