aboutsummaryrefslogtreecommitdiff
path: root/js/panels/presets/transitions-presets.reel
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/presets/transitions-presets.reel
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/presets/transitions-presets.reel')
-rw-r--r--js/panels/presets/transitions-presets.reel/transitions-presets.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/js/panels/presets/transitions-presets.reel/transitions-presets.html b/js/panels/presets/transitions-presets.reel/transitions-presets.html
index 2f084463..a6b98aeb 100644
--- a/js/panels/presets/transitions-presets.reel/transitions-presets.html
+++ b/js/panels/presets/transitions-presets.reel/transitions-presets.html
@@ -48,8 +48,8 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
48 </script> 48 </script>
49</head> 49</head>
50<body> 50<body>
51<section id="transitionsLibrary" class="transitionsLibrary"> 51<section data-montage-id="transitionsLibrary" class="transitionsLibrary">
52 <div id="libraryContainer"></div> 52 <div data-montage-id="libraryContainer"></div>
53</section> 53</section>
54</body> 54</body>
55</html> \ No newline at end of file 55</html> \ No newline at end of file