diff options
author | hwc487 | 2012-06-13 14:04:09 -0700 |
---|---|---|
committer | hwc487 | 2012-06-13 14:04:09 -0700 |
commit | 3e481dd581e0305dd8b572ed0d17e86622223464 (patch) | |
tree | aca2b28aa72857a52e047fb94090c34ab8dd1c2c /node_modules/montage/ui/scroll-bars.reel/scroll-bars.html | |
parent | a7aa51e6b91623772eef54b827616432838b560e (diff) | |
parent | 682f4917d6badd105998c3dd84d031c38b51f017 (diff) | |
download | ninja-3e481dd581e0305dd8b572ed0d17e86622223464.tar.gz |
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Textures
Diffstat (limited to 'node_modules/montage/ui/scroll-bars.reel/scroll-bars.html')
-rw-r--r-- | node_modules/montage/ui/scroll-bars.reel/scroll-bars.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html index 81f097fa..4be1e1b6 100644 --- a/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html +++ b/node_modules/montage/ui/scroll-bars.reel/scroll-bars.html | |||
@@ -10,7 +10,6 @@ | |||
10 | <script type="text/montage-serialization"> | 10 | <script type="text/montage-serialization"> |
11 | { | 11 | { |
12 | "owner": { | 12 | "owner": { |
13 | "prototype": "montage/ui/scroll-bars.reel", | ||
14 | "properties": { | 13 | "properties": { |
15 | "element": { | 14 | "element": { |
16 | "#": "montage-scroll-bars" | 15 | "#": "montage-scroll-bars" |