aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage-google/picasa-carousel.reel
diff options
context:
space:
mode:
authorhwc4872012-06-28 12:17:22 -0700
committerhwc4872012-06-28 12:17:22 -0700
commit230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596 (patch)
tree133be243b24260f831252f347ed66f24e2b78136 /node_modules/montage-google/picasa-carousel.reel
parent22cbc9644b79df60b3f6336f9563debd47fb3ea1 (diff)
parent56d6311f398e04eee3883a5c848fec3b2b53c981 (diff)
downloadninja-230b3d0fdfd29e998b82fef9f1ff5d2ca7ef8596.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into Taper
Diffstat (limited to 'node_modules/montage-google/picasa-carousel.reel')
-rwxr-xr-xnode_modules/montage-google/picasa-carousel.reel/picasa-carousel.html1
1 files changed, 0 insertions, 1 deletions
diff --git a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
index 8712c228..b5949299 100755
--- a/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
+++ b/node_modules/montage-google/picasa-carousel.reel/picasa-carousel.html
@@ -12,7 +12,6 @@
12 <script type="text/montage-serialization"> 12 <script type="text/montage-serialization">
13 { 13 {
14 "owner": { 14 "owner": {
15 "prototype": "picasa-carousel.reel",
16 "properties": { 15 "properties": {
17 "element": {"#": "montage-google-picasa-carousel"}, 16 "element": {"#": "montage-google-picasa-carousel"},
18 "flow": {"@": "flow"} 17 "flow": {"@": "flow"}