From 6d89689c0e7250b9ce945ca1ccd117f7a19b0e68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Lalinsk=C3=BD?= <lalinsky@gmail.com>
Date: Thu, 11 Jul 2013 10:23:01 +0200
Subject: [PATCH] Fix broken merge

---
 taglib/toolkit/tstring.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/taglib/toolkit/tstring.cpp b/taglib/toolkit/tstring.cpp
index 34481ca7..ad0f7e7b 100644
--- a/taglib/toolkit/tstring.cpp
+++ b/taglib/toolkit/tstring.cpp
@@ -313,7 +313,7 @@ const char *String::toCString(bool unicode) const
 
 const wchar_t *String::toCWString() const
 {
-  return d->data.c_str();
+  return d->data->c_str();
 }
 
 String::Iterator String::begin()