Skip to content

Commit ee3c4c3

Browse files
committed
resolve merge conflicts
1 parent f149536 commit ee3c4c3

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

articles/ai-services/document-intelligence/studio-overview.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,6 @@ With Document Intelligence, you can quickly automate your data processing in app
181181
* Select **Privacy**
182182
* Deselect **Block all cookies**
183183

184-
<<<<<<< HEAD
185-
=======
186-
### [**AI Studio**](#tab/ai-studio)
187-
188-
Document Intelligence is part of the Azure AI services offerings in the Azure AI Studio. Each of the Azure AI services helps developers and organizations rapidly create intelligent, cutting-edge, market-ready, and responsible applications with out-of-the-box and prebuilt and customizable APIs and models.
189-
190-
Learn how to [connect your AI services hub](../../ai-studio/ai-services/how-to/connect-ai-services.md) with AI services and get started using Document Intelligence.
191-
>>>>>>> 46cb645f8cdd89ba252fa94fce782fc163e63330
192184

193185
## Next steps
194186

articles/ai-services/includes/reference/sdk/javascript.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.author: lajanuar
1515
| Service | Description | Reference documentation |
1616
| --- | --- | --- |
1717
| ![Azure AI Search icon](~/reusable-content/ce-skilling/azure/media/ai-services/search.svg) [Azure AI Search](/azure/search/) | Bring AI-powered cloud search to your mobile and web apps. | &bullet;&NonBreakingSpace;[Azure AI Search SDK for JavaScript](/javascript/api/overview/azure/search-documents-readme?view=azure-node-latest&preserve-view=true) <br><br>&bullet;&NonBreakingSpace;[Azure AI Search npm package](https://www.npmjs.com/package/@azure/search-documents/v/12.0.0?activeTab=readme) |
18-
| ![Azure OpenAI Service icon](~/reusable-content/ce-skilling/azure/media/ai-services/azure-openai.svg) [Azure OpenAI](../../../openai/index.yml) | Perform a wide variety of natural language tasks. | &bullet;&NonBreakingSpace; [Azure OpenAI SDK for JavaScript](/javascript/api/@azure/openai/?view=azure-node-preview&preserve-view=true&branch=main)<br><br>&bullet;&NonBreakingSpace;[Azure OpenAI npm package](https://www.npmjs.com/package/@azure/openai/v/1.0.0-beta.11) |
18+
| ![Azure OpenAI Service icon](~/reusable-content/ce-skilling/azure/media/ai-services/azure-openai.svg) [Azure OpenAI](../../../openai/index.yml) | Perform a wide variety of natural language tasks. | &bullet;&NonBreakingSpace; [Azure OpenAI SDK for JavaScript](s/javascript/api/overview/azure/openai?view=azure-node-latest&preserve-view=true)<br><br>&bullet;&NonBreakingSpace;[Azure OpenAI npm package](https://www.npmjs.com/package/@azure/openai/v/1.0.0-beta.11) |
1919
| ![Bot service icon](~/reusable-content/ce-skilling/azure/media/ai-services/bot-services.svg) [Bot Service](/composer/) | Create bots and connect them across channels. | &bullet;&NonBreakingSpace;[Bot Service SDK for JavaScript](https://github.com/Microsoft/botbuilder-js?tab=readme-ov-file)<br><br>&bullet;&NonBreakingSpace;[Bot Builder npm package)](https://github.com/Microsoft/botbuilder-js#packages) |
2020
| ![Content Safety icon](~/reusable-content/ce-skilling/azure/media/ai-services/content-safety.svg) [Content Safety](../../../content-safety/index.yml) | Detect harmful content in applications and services.| &bullet;&NonBreakingSpace;[Content Safety SDK for JavaScript](/javascript/api/%40azure-rest/ai-content-safety/?view=azure-node-latest&preserve-view=true)<br><br>&bullet;&NonBreakingSpace;[Content Safety npm package](https://www.npmjs.com/package/@azure-rest/ai-content-safety/v/1.0.0-beta.1) |
2121
| ![Custom Vision icon](~/reusable-content/ce-skilling/azure/media/ai-services/custom-vision.svg) [Custom Vision](../../../custom-vision-service/index.yml) | Customize image recognition for your applications and models. |&bullet;&NonBreakingSpace;[Custom Vision SDK for JavaScript (prediction)](/javascript/api/%40azure/cognitiveservices-customvision-prediction/?view=azure-node-latest&preserve-view=true) <br><br>&bullet;&NonBreakingSpace;[Custom Vision npm package (prediction)](https://www.npmjs.com/package/@azure/cognitiveservices-customvision-prediction) <br><br>&bullet;&NonBreakingSpace;[Custom Vision SDK for JavaScript (training)](/javascript/api/%40azure/cognitiveservices-customvision-training/?view=azure-node-latest&preserve-view=true)<br><br>&bullet;&NonBreakingSpace;[Custom Vision npm package (training)](https://www.npmjs.com/package/@azure/cognitiveservices-customvision-training) |

0 commit comments

Comments
 (0)