Revert "Formatting, spelling, comment fixes."

This reverts commit 7a19efe040.
This commit is contained in:
Wladimir J. van der Laan
2014-07-17 14:08:07 +02:00
parent cd057bfd41
commit ad26dc9c31
6 changed files with 18 additions and 23 deletions

View File

@@ -546,9 +546,9 @@ QVariant TransactionTableModel::data(const QModelIndex &index, int role) const
case Qt::TextAlignmentRole:
return column_alignments[index.column()];
case Qt::BackgroundColorRole:
if (rec->status.hasConflicting)
if (rec->status.hasConflicting)
return COLOR_HASCONFLICTING_BG;
break;
break;
case Qt::ForegroundRole:
if (rec->status.hasConflicting)
return COLOR_HASCONFLICTING;