Skip to content

Commit 88c2513

Browse files
committed
Remove commited conflict markers
1 parent 2d89ad0 commit 88c2513

2 files changed

Lines changed: 14 additions & 28 deletions

File tree

docs/website/content/docs/reference/release-notes/index.mdx

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
---
22
title: SDK Release Notes — v0.13.x (latest)
3-
<<<<<<< HEAD
43
description: Lists all releases from v0.13.0 to v0.13.3.
5-
=======
6-
description: Lists all releases from v0.13.0 to v0.13.2.
7-
>>>>>>> main
84
---
95

106
## v0.13.0
@@ -181,7 +177,6 @@ WAN2_1_I2V_14B_Q4_K_M
181177
WAN2_1_I2V_14B_Q4_K_M_1
182178
```
183179

184-
<<<<<<< HEAD
185180
## v0.13.3
186181

187182
### @qvac/sdk
@@ -196,20 +191,6 @@ dependency to `^0.5.0`.
196191
The bundled `@qvac/decoder-audio` audio decoder is updated to `^0.5.0`. The same
197192
update is mirrored into the Bare build (`@qvac/bare-sdk`), which ships in lockstep
198193
with `@qvac/sdk`.
199-
=======
200-
## v0.13.1
201-
202-
### @qvac/sdk
203-
204-
### Changelog v0.13.1 (LLM)
205-
206-
Dependency-maintenance patch. No public API changes.
207-
208-
- `bare-fetch` `^3.0.1` (transitive-only major; fetch API unchanged; only 3.0.1 header validation, all SDK headers are RFC-valid).
209-
- dev `bare-subprocess` `^6.1.0` (not shipped to consumers).
210-
- `@qvac/decoder-audio` `^0.4.0`: removes the deprecated `@qvac/response` package (folded into `@qvac/infer-base`) from the dependency tree, eliminating its exact `bare-events 2.4.2` pin. `decoder-audio@0.4.0`'s `run()` returns `QvacResponse` synchronously; `server/utils/audio/decoder.ts` updated to not `await` it.
211-
- `@qvac/sdk` + `@qvac/bare-sdk` bumped in lockstep.
212-
- Validated by a clean install: no `@qvac/response`, no `bare-events@2.4.2`, no `bare-fetch@2.x`, no `decoder-audio@0.3.x` resolve in the tree.
213194

214195
## v0.13.2
215196

@@ -257,4 +238,17 @@ per-platform prebuilds at install time. Both packages remain available in
257238
`@qvac/sdk` for the Node host path.
258239

259240
The bundled `@qvac/rag` dependency is updated to `^0.6.4`.
260-
>>>>>>> main
241+
242+
## v0.13.1
243+
244+
### @qvac/sdk
245+
246+
### Changelog v0.13.1 (LLM)
247+
248+
Dependency-maintenance patch. No public API changes.
249+
250+
- `bare-fetch``^3.0.1` (transitive-only major; fetch API unchanged; only 3.0.1 header validation, all SDK headers are RFC-valid).
251+
- dev `bare-subprocess``^6.1.0` (not shipped to consumers).
252+
- `@qvac/decoder-audio``^0.4.0`: removes the deprecated `@qvac/response` package (folded into `@qvac/infer-base`) from the dependency tree, eliminating its exact `bare-events 2.4.2` pin. `decoder-audio@0.4.0`'s `run()` returns `QvacResponse` synchronously; `server/utils/audio/decoder.ts` updated to not `await` it.
253+
- `@qvac/sdk` + `@qvac/bare-sdk` bumped in lockstep.
254+
- Validated by a clean install: no `@qvac/response`, no `bare-events@2.4.2`, no `bare-fetch@2.x`, no `decoder-audio@0.3.x` resolve in the tree.

docs/website/src/lib/versions.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,7 @@ export interface VersionedSection {
4040

4141
export const API_SECTION: VersionedSection = {
4242
basePath: '/reference/api',
43-
<<<<<<< HEAD
4443
latest: 'v0.13.3',
45-
=======
46-
latest: 'v0.13.2',
47-
>>>>>>> main
4844
latestSeries: 'v0.13.x',
4945
versions: [
5046
{ label: 'v0.13.x (latest)', value: 'v0.13.x', isLatest: true },
@@ -58,11 +54,7 @@ export const API_SECTION: VersionedSection = {
5854

5955
export const RELEASE_NOTES_SECTION: VersionedSection = {
6056
basePath: '/reference/release-notes',
61-
<<<<<<< HEAD
6257
latest: 'v0.13.3',
63-
=======
64-
latest: 'v0.13.2',
65-
>>>>>>> main
6658
latestSeries: 'v0.13.x',
6759
versions: [
6860
{ label: 'v0.13.x (latest)', value: 'v0.13.x', isLatest: true },

0 commit comments

Comments
 (0)