aboutsummaryrefslogtreecommitdiff
path: root/node_modules/components-data/picasa-carousel.json
diff options
context:
space:
mode:
authorJohn Mayhew2012-05-10 15:27:40 -0700
committerJohn Mayhew2012-05-10 15:27:40 -0700
commitd5995fd5dfcc0cb0cb2361b1099911fa4fc51189 (patch)
tree3a683ac5ddcb3fc7fa4111e7769c15abb31c1ec4 /node_modules/components-data/picasa-carousel.json
parentba64dfa1d64969e290f15459a826171468fe3550 (diff)
parent632a53278826a33506b302b573ee0681840f2d6c (diff)
downloadninja-d5995fd5dfcc0cb0cb2361b1099911fa4fc51189.tar.gz
Merge branch 'master' of github.com:Motorola-Mobility/ninja-internal into WorkingBranch
Diffstat (limited to 'node_modules/components-data/picasa-carousel.json')
-rw-r--r--node_modules/components-data/picasa-carousel.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/node_modules/components-data/picasa-carousel.json b/node_modules/components-data/picasa-carousel.json
index 2eb601c7..b0711b12 100644
--- a/node_modules/components-data/picasa-carousel.json
+++ b/node_modules/components-data/picasa-carousel.json
@@ -1,7 +1,7 @@
1{ 1{
2 "component": "picasa-carousel", 2 "component": "picasa-carousel",
3 3
4 "module": "montage/ui/picasa-carousel.reel", 4 "module": "montage-google/picasa-carousel.reel",
5 5
6 "name": "PicasaCarousel", 6 "name": "PicasaCarousel",
7 7