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:
parent
f0728ade8f
commit
298e9c04bd
File diff suppressed because one or more lines are too long
@ -2951,8 +2951,6 @@ abbr.required {
|
|||||||
bottom: 1px;
|
bottom: 1px;
|
||||||
}
|
}
|
||||||
|
|
||||||
<<<<<<< .mine
|
|
||||||
=======
|
|
||||||
/* favorite-actions */
|
/* favorite-actions */
|
||||||
#favorite-actions {
|
#favorite-actions {
|
||||||
float: right;
|
float: right;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user