sergiotarxz
/
Wordpress
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove merge cruft. props ocean90. 

git-svn-id: https://develop.svn.wordpress.org/trunk@16737 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Andrew Nacin 2010-12-06 00:58:20 +00:00
parent f0728ade8f
commit 298e9c04bd
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/css/wp-admin.css
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin.dev.css
View File

@ -2951,8 +2951,6 @@ abbr.required {
bottom: 1px; bottom: 1px;
} }
<<<<<<< .mine
=======
/* favorite-actions */ /* favorite-actions */
#favorite-actions { #favorite-actions {
float: right; float: right;