diff options
Diffstat (limited to 'docs/html/wear')
| -rw-r--r-- | docs/html/wear/images/hero.jpg | bin | 117586 -> 248879 bytes | |||
| -rw-r--r-- | docs/html/wear/index.jd | 4 |
2 files changed, 1 insertions, 3 deletions
diff --git a/docs/html/wear/images/hero.jpg b/docs/html/wear/images/hero.jpg Binary files differindex 565ffb8..7850a81 100644 --- a/docs/html/wear/images/hero.jpg +++ b/docs/html/wear/images/hero.jpg diff --git a/docs/html/wear/index.jd b/docs/html/wear/index.jd index 4c56cf2..026698c 100644 --- a/docs/html/wear/index.jd +++ b/docs/html/wear/index.jd @@ -182,11 +182,9 @@ page.type=about </div> </div> <!-- end .wrap --> </div> <!-- end .landing-section --> -<<<<<<< HEAD + <!-- -======= ->>>>>>> add page.types to various pages for dynamic content <div class="landing-section landing-white-background"> <div class="wrap"> <div class="landing-section-header"> |
