aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/subselection-properties.reel/subselection-properties.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/components/tools-properties/subselection-properties.reel/subselection-properties.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/components/tools-properties/subselection-properties.reel/subselection-properties.html')
-rwxr-xr-xjs/components/tools-properties/subselection-properties.reel/subselection-properties.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html b/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
index 79460f93..bde47659 100755
--- a/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
+++ b/js/components/tools-properties/subselection-properties.reel/subselection-properties.html
@@ -24,7 +24,7 @@
24 </head> 24 </head>
25 25
26 <body> 26 <body>
27 <div id="subSelectionProperties"> 27 <div data-montage-id="subSelectionProperties">
28 <div></div> 28 <div></div>
29 </div> 29 </div>
30 </body> 30 </body>