aboutsummaryrefslogtreecommitdiff
path: root/node_modules/montage-google/picasa-carousel.reel
diff options
context:
space:
mode:
authorJose Antonio Marquez2012-06-27 16:26:53 -0700
committerJose Antonio Marquez2012-06-27 16:26:53 -0700
commit82abdd67e024d668dfb0a7b72ad81e28367b9fd5 (patch)
tree09dc5bdd1d132c2871ff8ec216dc050f93ac516f /node_modules/montage-google/picasa-carousel.reel
parent4f0104b0120219cbba2e0ac02c7b6aea437dd212 (diff)
parentec438dd0b501296f9aca8fdab7be99e518d7a8fd (diff)
downloadninja-82abdd67e024d668dfb0a7b72ad81e28367b9fd5.tar.gz
Merge branch 'refs/heads/Ninja-Internal' into Color
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"}