Skip to content

Commit

Permalink
fix: fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
plutoless committed Nov 5, 2024
1 parent f0d2b62 commit f4aeba4
Show file tree
Hide file tree
Showing 2 changed files with 125 additions and 365 deletions.
9 changes: 6 additions & 3 deletions agents/manifest-lock.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,8 @@
"type": "system",
"name": "azure_speech_sdk"
}
]
],
"supports": []
},
{
"type": "extension",
Expand All @@ -127,7 +128,8 @@
"type": "system",
"name": "nlohmann_json"
}
]
],
"supports": []
},
{
"type": "system",
Expand All @@ -145,7 +147,8 @@
"type": "system",
"name": "nlohmann_json",
"version": "3.11.2",
"hash": "72b15822c7ea9deef5e7ad96216ac55e93f11b00466dd1943afd5ee276e99d19"
"hash": "72b15822c7ea9deef5e7ad96216ac55e93f11b00466dd1943afd5ee276e99d19",
"supports": []
},
{
"type": "system",
Expand Down
Loading

0 comments on commit f4aeba4

Please sign in to comment.