diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-22 10:48:58 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-22 10:48:58 (GMT) |
| commit | 65398953e6ebaab177046b9516f15920b1f9d1a4 (patch) | |
| tree | 207c2871c80074ffabb32b5f5837acd1d8db7cf5 /src/gui/mac/macresources.qrc | |
| parent | e238e7b06f4c90c4b36621ade07329264fa7bed3 (diff) | |
| download | Qt-65398953e6ebaab177046b9516f15920b1f9d1a4.zip Qt-65398953e6ebaab177046b9516f15920b1f9d1a4.tar.gz Qt-65398953e6ebaab177046b9516f15920b1f9d1a4.tar.bz2 | |
Remove git merge conflict markers
Reviewed-by: Trust me
Diffstat (limited to 'src/gui/mac/macresources.qrc')
0 files changed, 0 insertions, 0 deletions