diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-22 12:48:58 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-22 12:48:58 +0200 |
| commit | 65398953e6ebaab177046b9516f15920b1f9d1a4 (patch) | |
| tree | 207c2871c80074ffabb32b5f5837acd1d8db7cf5 /tools/qdoc3/test/qmake.qdocconf | |
| parent | e238e7b06f4c90c4b36621ade07329264fa7bed3 (diff) | |
| download | qt4-tools-65398953e6ebaab177046b9516f15920b1f9d1a4.tar.gz | |
Remove git merge conflict markers
Reviewed-by: Trust me
Diffstat (limited to 'tools/qdoc3/test/qmake.qdocconf')
| -rw-r--r-- | tools/qdoc3/test/qmake.qdocconf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/qdoc3/test/qmake.qdocconf b/tools/qdoc3/test/qmake.qdocconf index 62cd4ff21f..642e3be7c8 100644 --- a/tools/qdoc3/test/qmake.qdocconf +++ b/tools/qdoc3/test/qmake.qdocconf @@ -18,7 +18,6 @@ qhp.qmake.virtualFolder = qdoc qhp.qmake.indexTitle = QMake Manual qhp.qmake.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png qhp.qmake.filterAttributes = qt 4.6.0 tools qmake ->>>>>>> 4.5:tools/qdoc3/test/qmake.qdocconf qhp.qmake.customFilters.qmake.name = qmake Manual qhp.qmake.customFilters.qmake.filterAttributes = qt tools qmake qhp.qmake.subprojects = manual |