aboutsummaryrefslogtreecommitdiff
path: root/js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-07 16:30:19 -0700
committerJohn Mayhew2012-05-07 16:30:19 -0700
commitdb4ba95f50148198759dde503ec1c778184d9dbe (patch)
tree8b79ad58108af2f17d15abc8cdc33d35229ab20d /js/panels/Timeline/TrackSpacer.reel/TrackSpacer.html
parent843d8ea8ee58a54bcb71d7b28dbf78fae153b491 (diff)
parent526e423e4a2734c2b139af23911e912452a4443f (diff)
downloadninja-db4ba95f50148198759dde503ec1c778184d9dbe.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Conflicts: js/components/layout/tools-list.reel/tools-list.html js/components/layout/tools-properties.reel/tools-properties.html js/components/tools-properties/brush-properties.reel/brush-properties.html js/components/tools-properties/fill-properties.reel/fill-properties.html js/components/tools-properties/pen-properties.reel/pen-properties.html js/components/tools-properties/pencil-properties.reel/pencil-properties.html js/components/tools-properties/selection-properties.reel/selection-properties.html js/components/tools-properties/shape-properties.reel/shape-properties.html js/components/tools-properties/tag-properties.reel/tag-properties.html js/components/tools-properties/text-properties.reel/text-properties.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>