Skip to content

Commit 6cf123c

Browse files
Merge branch 'psl-congen24' of https://github.com/microsoft/content-processing-solution-accelerator into psl-congen24
2 parents e81586f + cb9a6d5 commit 6cf123c

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

src/ContentProcessorWeb/package.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,11 @@
101101
"form-data": ">=4.0.6",
102102
"ws": ">=8.21.0",
103103
"js-yaml": ">=4.2.0",
104+
<<<<<<< HEAD
104105
"@babel/core": "7.29.7",
106+
=======
107+
"@babel/core": "^7.29.6",
108+
>>>>>>> cb9a6d5b0445aeaa6ac4f3ecdfce458168afc66d
105109
"postcss": "8.5.10",
106110
"nth-check": "^2.1.1",
107111
"string_decoder": "^1.3.0",
@@ -115,7 +119,7 @@
115119
"path-to-regexp": "^0.1.13",
116120
"picomatch": "^2.3.2",
117121
"qs": "6.15.2",
118-
"rollup": "^2.80.0",
122+
"rollup": "^2.80.0",
119123
"serialize-javascript": "^7.0.5",
120124
"underscore": "^1.13.8",
121125
"webpack-dev-server": ">=5.2.5",

src/ContentProcessorWorkflow/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ description = "Add your description here"
55
readme = "README.md"
66
requires-python = ">=3.12"
77
dependencies = [
8-
"agent-framework==1.3.0",
8+
"agent-framework==1.9.0",
99
"aiohttp==3.14.1",
1010
"art==6.5",
1111
"azure-ai-agents==1.2.0b5",

0 commit comments

Comments
 (0)