Conflicts: public/stylesheets/public.css 处理冲突
@ -81,6 +81,7 @@
<%= format_time(attachment.created_on) %>
</span>
</div>
<div class="cl"></div>
<% end %>