# Conflicts:
# actions/default/index.html
# actions/default/index_hk.html
# actions/yohood/default/index.html
# actions/yohood/default/index320.html
# actions/yohood/default/index_hk.html
# actions/yohood/default/index_hk320.html
# partials/channel/banner_one.html
# partials/common/environment_css.html
# partials/layout/back_header320.html
# partials/layout/back_header_hk320.html
# partials/layout/header320.html
# partials/layout/header_fan.html
# partials/layout/header_jian.html
# partials/layout/writer_header320.html
# partials/layout/writer_header_hk320.html
yi xian shang wei zhun
