aboutsummaryrefslogtreecommitdiff
path: root/src/qt/transactiontablemodel.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2014-07-17 14:08:07 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2014-07-21 07:46:33 +0200
commitad26dc9c314406034cef7684d4c9f9ec31d6347e (patch)
tree4d0d630b572f44025b1674cb02f44953f44c05e6 /src/qt/transactiontablemodel.cpp
parentcd057bfd415815dd4fa219ef213640635d4b6d37 (diff)
Revert "Formatting, spelling, comment fixes."
This reverts commit 7a19efe04069d9a1e251cdc94b25184f76d9d901.
Diffstat (limited to 'src/qt/transactiontablemodel.cpp')
-rw-r--r--src/qt/transactiontablemodel.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qt/transactiontablemodel.cpp b/src/qt/transactiontablemodel.cpp
index cf4c90c7ff..6156a2ecd2 100644
--- a/src/qt/transactiontablemodel.cpp
+++ b/src/qt/transactiontablemodel.cpp
@@ -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;