Remove merge cruft. props ocean90.

git-svn-id: https://develop.svn.wordpress.org/trunk@16737 602fd350-edb4-49c9-b593-d223f7449a82
2010-12-06 00:58:20 +00:00 · 2010-12-06 00:58:20 +00:00 · 298e9c04bd
commit 298e9c04bd
parent f0728ade8f
2 changed files with 1 additions and 3 deletions
--- a/wp-admin/css/wp-admin.css
+++ b/wp-admin/css/wp-admin.css
--- a/wp-admin/css/wp-admin.dev.css
+++ b/wp-admin/css/wp-admin.dev.css
@ -2951,8 +2951,6 @@ abbr.required {
 	bottom: 1px;
 }

-<<<<<<< .mine
-=======
 /* favorite-actions */
 #favorite-actions {
 	float: right;