developers
/
orbit-4-1
Archived
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Resolve conflicts

This commit is contained in:
chris2tof 2011-11-20 01:35:28 +08:00
parent e99affbddd e4dc5bd107
commit c9137737e3
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css vendored
View File

@ -48,5 +48,4 @@
} }
.production a:hover{ .production a:hover{
text-decoration: underline; text-decoration: underline;
>>>>>>> e4dc5bd10760d23b7696c1df132454db368a73cc
} }