From d22adb21e634635f43bcec17dbb987992ece520f Mon Sep 17 00:00:00 2001 From: Alex Gorevski Date: Thu, 19 Feb 2026 12:54:42 -0800 Subject: [PATCH] fix: resolve merge conflict in pull request template Remove merge conflict markers in .github/pull_request_template.md, keeping the spaced module label format (\: \) from the chore/labeler-spacing-trusted-tier branch. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/pull_request_template.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 7c9e601..7990431 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -12,11 +12,7 @@ Describe this PR in 2-5 bullets: - Risk label (`risk: low|medium|high`): - Size label (`size: XS|S|M|L|XL`, auto-managed/read-only): - Scope labels (`core|agent|channel|config|cron|daemon|doctor|gateway|health|heartbeat|integration|memory|observability|onboard|provider|runtime|security|service|skillforge|skills|tool|tunnel|docs|dependencies|ci|tests|scripts|dev`, comma-separated): -<<<<<<< chore/labeler-spacing-trusted-tier - Module labels (`: `, for example `channel: telegram`, `provider: kimi`, `tool: shell`): -======= -- Module labels (`:`, for example `channel:telegram`, `provider:kimi`, `tool:shell`): ->>>>>>> main - Contributor tier label (`trusted contributor|experienced contributor|principal contributor|distinguished contributor`, auto-managed/read-only; author merged PRs >=5/10/20/50): - If any auto-label is incorrect, note requested correction: