diff options
author | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
---|---|---|
committer | Pushkar Joshi | 2012-06-13 14:00:31 -0700 |
commit | 596765056ca6e5b08395c6d7ea19e7684c2acaf3 (patch) | |
tree | 480f42ffc0782ca768284c1208a8f99adb5636a2 /js/components/tools-properties/shape-properties.reel/shape-properties.html | |
parent | 75df16b937bb420e7d93a411e73f7b59578b1b7e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-596765056ca6e5b08395c6d7ea19e7684c2acaf3.tar.gz |
Merge branch 'master' into brushtool
Diffstat (limited to 'js/components/tools-properties/shape-properties.reel/shape-properties.html')
-rwxr-xr-x | js/components/tools-properties/shape-properties.reel/shape-properties.html | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/js/components/tools-properties/shape-properties.reel/shape-properties.html b/js/components/tools-properties/shape-properties.reel/shape-properties.html index 9b523a3f..ea246ea8 100755 --- a/js/components/tools-properties/shape-properties.reel/shape-properties.html +++ b/js/components/tools-properties/shape-properties.reel/shape-properties.html | |||
@@ -118,12 +118,7 @@ | |||
118 | "rectProperties": {"@": "rectProperties1"}, | 118 | "rectProperties": {"@": "rectProperties1"}, |
119 | "lineProperties": {"@": "lineProperties1"}, | 119 | "lineProperties": {"@": "lineProperties1"}, |
120 | 120 | ||
121 | "endDivider": {"#": "endDivider"}, | 121 | "endDivider": {"#": "endDivider"} |
122 | |||
123 | "components": [ | ||
124 | {"@": "repetition1"} | ||
125 | ] | ||
126 | |||
127 | } | 122 | } |
128 | 123 | ||
129 | } | 124 | } |