summaryrefslogtreecommitdiffstats
path: root/tools/qdoc3/test/linguist.qdocconf
diff options
context:
space:
mode:
Diffstat (limited to 'tools/qdoc3/test/linguist.qdocconf')
-rw-r--r--tools/qdoc3/test/linguist.qdocconf1
1 files changed, 0 insertions, 1 deletions
diff --git a/tools/qdoc3/test/linguist.qdocconf b/tools/qdoc3/test/linguist.qdocconf
index 9a9c5b0..f4ee211 100644
--- a/tools/qdoc3/test/linguist.qdocconf
+++ b/tools/qdoc3/test/linguist.qdocconf
@@ -18,7 +18,6 @@ qhp.Linguist.virtualFolder = qdoc
qhp.Linguist.indexTitle = Qt Linguist Manual
qhp.Linguist.extraFiles = classic.css images/qt-logo.png images/trolltech-logo.png
qhp.Linguist.filterAttributes = qt 4.6.0 tools linguist
->>>>>>> 4.5:tools/qdoc3/test/linguist.qdocconf
qhp.Linguist.customFilters.Linguist.name = Qt Linguist Manual
qhp.Linguist.customFilters.Linguist.filterAttributes = qt tools linguist
qhp.Linguist.subprojects = manual examples