deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-06-15 02:13:43 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

resoving conflict

Browse Source
This commit is contained in:
Dolcita Montemayor
2019-04-15 13:30:34 -07:00
parent 2057346a64 18e8a8d412
commit ccb44c1ca7
33 changed files with 340 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
browsers/edge/docfx.json
View File

@ -24,7 +24,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "Win.microsoft-edge"
"depot_name": "Win.microsoft-edge",
"folder_relative_path_in_docset": "./"
}
}
},
@ -34,4 +35,4 @@
"dest": "browsers/edge",
"markdownEngineName": "dfm"
}
}
}

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

@ -27,7 +27,8 @@
"feedback_product_url": "https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app",
"_op_documentIdPathDepotMapping": {
"./": {
"depot_name": "Win.internet-explorer"
"depot_name": "Win.internet-explorer",
"folder_relative_path_in_docset": "./"
}
}
},
@ -37,4 +38,4 @@
"dest": "edges/internet-explorer",
"markdownEngineName": "dfm"
}
}
}