deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-06-28 00:33:40 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

fixing merge conflict

Browse Source
This commit is contained in:
Brian Lich
2017-04-24 11:41:24 -07:00
parent 27678c6912 15f535aebd
commit 73f5b23246
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
browsers/internet-explorer/docfx.json
View File

@ -18,6 +18,7 @@
"breadcrumb_path": "/internet-explorer/breadcrumb/toc.json", "breadcrumb_path": "/internet-explorer/breadcrumb/toc.json",
"ROBOTS": "INDEX, FOLLOW", "ROBOTS": "INDEX, FOLLOW",
"ms.author": "lizross", "ms.author": "lizross",
"author": "lizross",
"ms.technology": "internet-explorer", "ms.technology": "internet-explorer",
"ms.topic": "article" "ms.topic": "article"
}, },

2
devices/surface-hub/docfx.json
View File

@ -16,7 +16,7 @@
"globalMetadata": { "globalMetadata": {
"uhfHeaderId": "MSDocsHeader-WindowsIT", "uhfHeaderId": "MSDocsHeader-WindowsIT",
"breadcrumb_path": "/surface-hub/breadcrumb/toc.json", "breadcrumb_path": "/surface-hub/breadcrumb/toc.json",
"ROBOTS": "INDEX, FOLLOW", "ROBOTS": "INDEX, FOLLOW",
"ms.technology": "windows", "ms.technology": "windows",
"ms.topic": "article", "ms.topic": "article",
"ms.mktglfcycl": "manage", "ms.mktglfcycl": "manage",