Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-23 00:31:28 +01:00
Code Issues Projects Releases Wiki Activity

Remove merge cruft. props ocean90.

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@16737 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-12-06 00:58:20 +00:00
parent 86e27c44b9
commit 6c2529ebac
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;
}
<<<<<<< .mine
=======
/* favorite-actions */
#favorite-actions {
float: right;