Merge pull request #100941 from IEvangelist/fixGitIssues

Jak-MS · web-flow · commit 96c66fee9a16 · 2020-01-13T10:17:56.000-06:00
[CogSvcs] fix bad merge issues
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/cpp/header.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/cpp/header.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/cpp/linux.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/cpp/linux.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 07/05/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: wolfma
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/cpp/macos.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/cpp/macos.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 07/05/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: wolfma
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/cpp/windows.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/cpp/windows.md
@@ -7,13 +7,8 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
 ms.author: wolfma61
-=======
-ms.date: 08/19/2019
-ms.author: wolfma
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ---
 
 ## Prerequisites
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/csharp/csharp.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/csharp/csharp.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/csharp/dotnet.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/csharp/dotnet.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/csharp/footer.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/csharp/footer.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/csharp/header.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/csharp/header.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/java/header.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/java/header.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/more/header.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/more/header.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/more/more.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/more/more.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/python/footer.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/python/footer.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/python/header.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/python/header.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/python/python.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-file/python/python.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 07/05/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: chlandsi
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/cpp.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/cpp.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 11/19/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/footer.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/footer.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/header.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/header.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/linux.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/linux.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 07/05/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: wolfma
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/macos.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/macos.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 07/05/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: wolfma
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/windows.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/cpp/windows.md
@@ -8,11 +8,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 08/19/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: wolfma
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/csharp/dotnet.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/csharp/dotnet.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/csharp/footer.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/csharp/footer.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/csharp/header.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/csharp/header.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/csharp/unity.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/csharp/unity.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
diff --git a/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/csharp/uwp.md b/articles/cognitive-services/Speech-Service/includes/quickstarts/from-microphone/csharp/uwp.md
@@ -7,11 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: speech-service
 ms.topic: include
-<<<<<<< HEAD
 ms.date: 12/17/2019
-=======
-ms.date: 10/28/2019
->>>>>>> 34375507a6a9dabc49d422608c19b7fe54779f45
 ms.author: erhopf
 ---
 
