Skip to content

Commit b535ccc

Browse files
author
mikeblome
committed
fixed merge conflict
2 parents 45545c3 + cca39be commit b535ccc

1,666 files changed

Lines changed: 17332 additions & 17054 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.openpublishing.publish.config.json‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@
77
"build_output_subfolder": "vcppdocs",
88
"locale": "en-us",
99
"monikers": [],
10-
"moniker_ranges": [">= vs-2015"],
10+
"moniker_ranges": [
11+
">= vs-2015"
12+
],
13+
"xref_query_tags": ["/dotnet", "/uwp/api"],
1114
"open_to_public_contributors": true,
1215
"type_mapping": {
1316
"Conceptual": "Content",
@@ -56,5 +59,8 @@
5659
}
5760
},
5861
"need_generate_pdf": false,
59-
"need_generate_intellisense": false
60-
}
62+
"need_generate_intellisense": false,
63+
"docs_build_engine": {
64+
"name": "docfx_v3"
65+
}
66+
}

0 commit comments

Comments
 (0)