Skip to content

Commit e02f992

Browse files
committed
fix merge conflict
1 parent 7c1582e commit e02f992

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

articles/ai-services/openai/includes/use-your-data-javascript.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,7 @@ Install the Azure OpenAI client and Azure Identity libraries for JavaScript with
2929
npm install openai @azure/identity @azure/openai
3030
```
3131

32-
<<<<<<< HEAD
33-
The `@azure/openai` dependency is included to extend the OpenAI model for the `data_sources` property. This import is only necessary for TypeScript.
34-
=======
3532
The `@azure/openai/types` dependency is included to extend the Azure OpenAI model for the `data_sources` property. This import is only necessary for TypeScript.
36-
>>>>>>> 873d1a85c45aa613e26bca472b6f80476dbcd47e
3733

3834
#### [JavaScript](#tab/javascript)
3935

0 commit comments

Comments
 (0)