Skip to content

Commit 53e60a0

Browse files
committed
corrected some merge related issues
2 parents bff4aba + 131a204 commit 53e60a0

File tree

6,271 files changed

+135786
-52453
lines changed

Some content is hidden

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

6,271 files changed

+135786
-52453
lines changed

.openpublishing.publish.config.json

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@
194194
{
195195
"path_to_root": "samples-cognitive-services-speech-sdk",
196196
"url": "https://github.com/Azure-Samples/cognitive-services-speech-sdk",
197-
"branch": "docs-201809"
197+
"branch": "rhurey/quickstart.refactor"
198198
},
199199
{
200200
"path_to_root": "media-services-v3-dotnet-quickstarts",
@@ -297,6 +297,16 @@
297297
"branch": "master",
298298
"branch_mapping": {}
299299
},
300+
{
301+
"path_to_root": "cosmos-dotnet-v4-getting-started",
302+
"url": "https://github.com/Azure-Samples/cosmos-dotnet-v4-getting-started",
303+
"branch": "master"
304+
},
305+
{
306+
"path_to_root": "cosmos-dotnet-bulk-import",
307+
"url": "https://github.com/Azure-Samples/cosmos-dotnet-bulk-import-throughput-optimizer",
308+
"branch": "master"
309+
},
300310
{
301311
"path_to_root": "samples-cosmosdb-dotnet-web-app",
302312
"url": "https://github.com/Azure-Samples/cosmos-dotnet-todo-app",
@@ -332,6 +342,11 @@
332342
"url": "https://github.com/Azure-Samples/azure-cosmos-db-sql-api-nodejs-getting-started",
333343
"branch": "master"
334344
},
345+
{
346+
"path_to_root": "azure-cosmos-db-python-getting-started",
347+
"url": "https://github.com/Azure-Samples/azure-cosmos-db-python-getting-started",
348+
"branch": "master"
349+
},
335350
{
336351
"path_to_root": "cognitive-services-content-moderator-samples",
337352
"url": "https://github.com/Azure-Samples/cognitive-services-content-moderator-samples",
@@ -377,6 +392,16 @@
377392
"url": "https://github.com/microsoft/immersive-reader-sdk",
378393
"branch": "master",
379394
"branch_mapping": {}
395+
},
396+
{
397+
"path_to_root": "azure-cosmosdb-java-v2",
398+
"url": "https://github.com/Azure/azure-cosmosdb-java",
399+
"branch": "master"
400+
},
401+
{
402+
"path_to_root": "azure-cosmosdb-java-v4-getting-started",
403+
"url": "https://github.com/Azure-Samples/azure-cosmos-java-getting-started",
404+
"branch": "master"
380405
}
381406
],
382407
"branch_target_mapping": {

0 commit comments

Comments
 (0)