aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/pencil-properties.reel
diff options
context:
space:
mode:
authorArmen Kesablyan2012-05-08 16:43:43 -0700
committerArmen Kesablyan2012-05-08 16:43:43 -0700
commitdc075ffcc6dd03c090d90fad999eee9b924d56ee (patch)
tree867f8bdd588c8f9076979233ca46a688ff70523e /js/components/tools-properties/pencil-properties.reel
parent5d7e470351fd150d5e70a97332fa2f2553797499 (diff)
parent4d949f141247215b5f2a6ec0cfc7d2d31cf2bb1f (diff)
downloadninja-dc075ffcc6dd03c090d90fad999eee9b924d56ee.tar.gz
Merge branch 'refs/heads/dom-architecture' into binding
Conflicts: js/components/layout/tools-properties.reel/tools-properties.html Signed-off-by: Armen Kesablyan <armen@motorola.com>
Diffstat (limited to 'js/components/tools-properties/pencil-properties.reel')
-rwxr-xr-xjs/components/tools-properties/pencil-properties.reel/pencil-properties.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html
index fc5f541e..cbe626b2 100755
--- a/js/components/tools-properties/pencil-properties.reel/pencil-properties.html
+++ b/js/components/tools-properties/pencil-properties.reel/pencil-properties.html
@@ -24,7 +24,7 @@
24 </head> 24 </head>
25 25
26 <body> 26 <body>
27 <div id="pencilProperties" class="subToolHolderPanel"> 27 <div data-montage-id="pencilProperties" class="subToolHolderPanel">
28 </div> 28 </div>
29 </body> 29 </body>
30 30