Skip to content

Commit 344248d

Browse files
committed
restore packages
1 parent 587153f commit 344248d

2 files changed

Lines changed: 18 additions & 0 deletions

File tree

eng/emitter-package-lock.json

Lines changed: 13 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

eng/emitter-package.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,17 @@
1414
"@typespec/streams": "~0.82.0",
1515
"@typespec/xml": "~0.82.0",
1616
"@typespec/openapi3": "1.12.0",
17+
<<<<<<< HEAD
1718
<<<<<<< HEAD
1819
"@typespec/http-client-python": "^0.31.0",
1920
"@azure-tools/openai-typespec": "1.20.0",
2021
=======
2122
"@azure-tools/openai-typespec": "1.19.0",
2223
>>>>>>> 04139a93e3 ([azure-ai-projects] Emit SDK from TypeSpec, using latest OpenAI TypeSpec package (#47318))
24+
=======
25+
"@typespec/http-client-python": "^0.31.0",
26+
"@azure-tools/openai-typespec": "1.20.0",
27+
>>>>>>> 8c5e21f58f (restore packages)
2328
"@azure-tools/typespec-autorest": "~0.68.0",
2429
"@azure-tools/typespec-azure-core": "~0.68.0",
2530
"@azure-tools/typespec-azure-resource-manager": "~0.68.0",

0 commit comments

Comments
 (0)