From 23e180d5cb4ca28d952276b2c74f49543b27e8fe Mon Sep 17 00:00:00 2001 From: oldschoola Date: Mon, 15 Jun 2026 04:00:37 -0700 Subject: [PATCH] Resolve changelog merge conflicts --- packages/ai/CHANGELOG.md | 1 + packages/catalog/CHANGELOG.md | 1 + packages/coding-agent/CHANGELOG.md | 1 + 3 files changed, 3 insertions(+) diff --git a/packages/ai/CHANGELOG.md b/packages/ai/CHANGELOG.md index 8e42f391e..084a43a18 100644 --- a/packages/ai/CHANGELOG.md +++ b/packages/ai/CHANGELOG.md @@ -5,6 +5,7 @@ ### Added - Added Umans AI Coding Plan API-key login support and `UMANS_AI_CODING_PLAN_API_KEY` environment fallback. + ## [15.13.3] - 2026-06-15 ### Added diff --git a/packages/catalog/CHANGELOG.md b/packages/catalog/CHANGELOG.md index 62ebd66a7..693c46678 100644 --- a/packages/catalog/CHANGELOG.md +++ b/packages/catalog/CHANGELOG.md @@ -5,6 +5,7 @@ ### Added - Added the Umans AI Coding Plan provider catalog with Anthropic-compatible model metadata and dynamic discovery. + ## [15.13.3] - 2026-06-15 ### Added diff --git a/packages/coding-agent/CHANGELOG.md b/packages/coding-agent/CHANGELOG.md index 5167c5f80..e1827e62d 100644 --- a/packages/coding-agent/CHANGELOG.md +++ b/packages/coding-agent/CHANGELOG.md @@ -5,6 +5,7 @@ ### Added - Added `UMANS_AI_CODING_PLAN_API_KEY` to the CLI environment help. + ## [15.13.3] - 2026-06-15 ### Added