详情页样式修改
git clean
Merge branch 'master' of https://github.com/Joyguo0/magento1810

Conflicts:
	app/design/frontend/default/se101/template/catalog/category/view.phtml
css.css的修改
Merge pull request #32 from chenlihua/master

详情页样式修改