aboutsummaryrefslogtreecommitdiff
path: root/skins
diff options
context:
space:
mode:
Diffstat (limited to 'skins')
-rw-r--r--skins/standard/global.css3
1 files changed, 1 insertions, 2 deletions
diff --git a/skins/standard/global.css b/skins/standard/global.css
index 37af44b3e..ab0fc8e30 100644
--- a/skins/standard/global.css
+++ b/skins/standard/global.css
@@ -746,7 +746,6 @@ input.required, select.required, span.required_explanation {
background-color: #FFEBEB;
}
-<<<<<<< HEAD
/* Gentoo bar */
body {
margin: 1em;
@@ -811,7 +810,7 @@ body.bz_product_Gentoo_Security #add_comment:after {
body.bz_product_Gentoo_Security #add_comment {
margin-bottom: 2em;
}
-=======
+
form th {
text-align: right;
}