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

Resolve conflicts

Browse Source
This commit is contained in:
chris2tof committed 2011-11-20 01:35:28 +08:00
2 parents e99affbddd e4dc5bd107
commit c9137737e3
1 file changed
-1
Download Patch File Download Diff File Expand all files Collapse all files
vendor/plugins/NewBlog/app/assets/stylesheets/NewBlog/production.css
Vendored
-1
View File
@@ -48,5 +48,4 @@
}
.production a:hover{
text-decoration: underline;
>>>>>>> e4dc5bd10760d23b7696c1df132454db368a73cc
}