summaryrefslogtreecommitdiffstats
path: root/src/libraries/qmfclient/qmailmessage.cpp
diff options
context:
space:
mode:
authorDon Sanders <don.sanders@nokia.com>2011-06-10 19:06:21 +0300
committerDon Sanders <don.sanders@nokia.com>2011-06-10 19:06:21 +0300
commit96b848bfb72b28753646e5b5ada2c70e08f6d4e9 (patch)
treecf6fbccfd705bbc24115c34f545d699dfbd44772 /src/libraries/qmfclient/qmailmessage.cpp
parent67d096d95cb47d773e91b852db47fc605446596c (diff)
parent8565b3c7ea895d1a755400f360f4e9b7ed0a6c8b (diff)
Resolve conflicts.
Diffstat (limited to 'src/libraries/qmfclient/qmailmessage.cpp')
-rw-r--r--src/libraries/qmfclient/qmailmessage.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libraries/qmfclient/qmailmessage.cpp b/src/libraries/qmfclient/qmailmessage.cpp
index e83e0d09..cc8c5951 100644
--- a/src/libraries/qmfclient/qmailmessage.cpp
+++ b/src/libraries/qmfclient/qmailmessage.cpp
@@ -8232,7 +8232,7 @@ void QMailMessage::refreshPreview()
QMailMessagePartContainer *part;
- // TODO: don't load entire body into memory
+ // TODO: don't load entire body into memory
// TODO: parse html correctly, e.g. closing brackets in quotes in tags
if ((part = findPlainTextContainer()) && part->hasBody()) {