search

wanmen / cats-rails

A Rails Implementation of Wanmen CATS
0 stars 0 forks source link

Fix Some CSS Style #75

Closed photino closed 11 years ago

photino commented 11 years ago
  1. Delete app/views/rates/_rates.html.erb.orig
  2. Fix the hover style for dropdown links
photino commented 11 years ago

@xtao 这个_rates.html.erb.orig.erb.orig是不是merge冲突产生的临时文件？删了没关系吧

xtao commented 11 years ago

恩，是冲突文件，先要确定更改都已经提交到当前分支上了。这个文件可以删除，如果确认没有冲突了之后。

photino commented 11 years ago

@xtao 冲突已经改过了 可以merge了吧

xtao commented 11 years ago

LGTM