mirror of
https://github.com/civitai/civitai.git
synced 2026-09-20 22:08:18 +08:00
briant
6648b3c021
Resolved 8 conflicts, all in the paid-access overlap. The paid-access
implementation is now canonical/deployed on main, so for the superseded branch
prototype (ba2b7fb1d4) took main's version: buzz/paid-access.ts (16-export
superset), model-version.service.ts, model-version.controller.ts, the v1
early-access.ts endpoint, ModelVersionUpsertForm.tsx, paid-access-query-sites.md.
Preserved branch-unique creator-studio work: buzz/creator-program.ts
(getForecastedValue/getCurrentValue, used by CreatorProgramV2 + creator-program.utils).
buzz/index.ts unioned to export both paid-access (main) and creator-program (branch);
dropped early-access (removed — superseded by paid-access.ts). Lockfile regenerated.
typecheck clean (0 errors).
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>