aboutsummaryrefslogtreecommitdiff
path: root/js/components/tools-properties/line-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/line-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/line-properties.reel')
-rwxr-xr-xjs/components/tools-properties/line-properties.reel/line-properties.html2
1 files changed, 1 insertions, 1 deletions
diff --git a/js/components/tools-properties/line-properties.reel/line-properties.html b/js/components/tools-properties/line-properties.reel/line-properties.html
index a8fc194e..0033b8a7 100755
--- a/js/components/tools-properties/line-properties.reel/line-properties.html
+++ b/js/components/tools-properties/line-properties.reel/line-properties.html
@@ -23,7 +23,7 @@
23 </head> 23 </head>
24 24
25 <body> 25 <body>
26 <div id="lineProperties"></div> 26 <div data-montage-id="lineProperties"></div>
27 </body> 27 </body>
28 28
29</html> \ No newline at end of file 29</html> \ No newline at end of file