Resolve Merge Conflicts for generate.cmd under EntitySearch (#4011)

Azure · Jan 24, 2018 · 52c7902 · 52c7902
1 parent f0eae29
commit 52c7902
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/generate.cmd b/src/SDKs/CognitiveServices/dataPlane/Search/BingEntitySearch/BingEntitySearch/generate.cmd
@@ -4,10 +4,4 @@
 ::
 
 @echo off
-<<<<<<< HEAD:src/SDKs/CognitiveServices/dataPlane/Search/EntitySearch/generate.cmd
 call %~dp0..\..\..\..\..\..\tools\generate.cmd cognitiveservices/data-plane/EntitySearch %*
-=======
-call %~dp0..\..\..\..\..\..\tools\generate.cmd cognitiveservices/data-plane/EntitySearch %*
-call %~dp0..\..\..\..\..\..\tools\generate.cmd cognitiveservices/data-plane/VideoSearch %*
-call %~dp0..\..\..\..\..\..\tools\generate.cmd cognitiveservices/data-plane/WebSearch %*
->>>>>>> upstream/psSdkJson6:src/SDKs/CognitiveServices/dataPlane/Search/Search/generate.cmd