diff options
| author | Sarah Smith <sarah.j.smith@nokia.com> | 2011-07-18 19:58:14 +1000 |
|---|---|---|
| committer | Sarah Jane Smith <sarah.j.smith@nokia.com> | 2011-07-18 12:00:28 +0200 |
| commit | 78cb1be30a38f53d80b852b8c84257e05a602624 (patch) | |
| tree | 38fc50b584e6ea11531eb6ee89672090ed5d5dba /sync.profile | |
| parent | 0d7d90514e95e9dc1a23e3f98a19d0ab3caa7288 (diff) | |
Fix more bad merges, now compiles.
Change-Id: Ie85ba1e9a255695f0257c74aee821593fe0c6ee0
Reviewed-on: http://codereview.qt.nokia.com/1741
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Diffstat (limited to 'sync.profile')
0 files changed, 0 insertions, 0 deletions