Remove merge cruft. props ocean90.

git-svn-id: http://svn.automattic.com/wordpress/trunk@16737 1a063a9b-81f0-0310-95a4-ce76da25c4cd
2010-12-06 00:58:20 +00:00 · 2010-12-06 00:58:20 +00:00 · 6c2529ebac
parent 86e27c44b9
commit 6c2529ebac
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;