Fix merge conflict

Signed-off-by: Marc Delisle <marc@infomarc.info>
2014-12-20 07:12:06 -05:00 · 2014-12-20 07:12:06 -05:00 · cbc0b61add
commit cbc0b61add
parent 57deba8567 5a4d8aa8cd
2 changed files with 5 additions and 1 deletions
--- a/1
+++ b/1
@ -12,6 +12,7 @@ phpMyAdmin - ChangeLog
 - bug       Undefined index central_columnswork
 - bug #4657 Don't have default blowfish_secret
 - bug #4656 Some error popups fade away too quickly
+- bug #4648 Consistency in borders 

 4.3.2.0 (2014-12-12)
 - bug #4628 PHP error while exporting schema as PDF
--- a/themes/pmahomme/css/common.css.php
+++ b/themes/pmahomme/css/common.css.php
@ -401,8 +401,11 @@ table {
    border-collapse: collapse;
 }

-th {
+thead th {
    border-right: 1px solid #fff;
+}
+
+th {
    text-align: left;
 }