From 6ebe00f072ea754dfece6c4d6601c9996461a07a Mon Sep 17 00:00:00 2001 From: chanthuang Date: Tue, 21 Apr 2026 21:48:46 +0800 Subject: [PATCH] fix(mail): remove leftover conflict marker in skill docs The <<<<<<< HEAD marker was accidentally left in mail.md and SKILL.md by commit cb301a3 (draft preview URL). Remove it. Change-Id: I6e1d5c0c66761302a3c4ee1421a16961b666bd80 --- skill-template/domains/mail.md | 1 - skills/lark-mail/SKILL.md | 1 - 2 files changed, 2 deletions(-) diff --git a/skill-template/domains/mail.md b/skill-template/domains/mail.md index 70a97671..af83ddc0 100644 --- a/skill-template/domains/mail.md +++ b/skill-template/domains/mail.md @@ -117,7 +117,6 @@ lark-cli mail multi_entity search --as user --data '{"query":"<关键词>"}' | **转发** | `+forward` | `+forward --confirm-send` | `+forward --confirm-send --send-time ` | - 有原邮件上下文 → 用 `+reply` / `+reply-all` / `+forward`（默认即草稿），**不要用 `+draft-create`** -<<<<<<< HEAD - **发送前必须向用户确认收件人和内容；如有必要，可引导用户去飞书邮件里打开草稿查看详情；用户明确同意后才可执行发送或使用 `--confirm-send`** - **发送后必须调用 `send_status` 确认投递状态**；定时发送（`--send-time`）在预定发送时间后再查询，取消定时发送用 `cancel_scheduled_send`（详见下方说明） diff --git a/skills/lark-mail/SKILL.md b/skills/lark-mail/SKILL.md index ca4e9a88..3a06a989 100644 --- a/skills/lark-mail/SKILL.md +++ b/skills/lark-mail/SKILL.md @@ -132,7 +132,6 @@ lark-cli mail multi_entity search --as user --data '{"query":"<关键词>"}' | **转发** | `+forward` | `+forward --confirm-send` | `+forward --confirm-send --send-time ` | - 有原邮件上下文 → 用 `+reply` / `+reply-all` / `+forward`（默认即草稿），**不要用 `+draft-create`** -<<<<<<< HEAD - **发送前必须向用户确认收件人和内容；如有必要，可引导用户去飞书邮件里打开草稿查看详情；用户明确同意后才可执行发送或使用 `--confirm-send`** - **发送后必须调用 `send_status` 确认投递状态**；定时发送（`--send-time`）在预定发送时间后再查询，取消定时发送用 `cancel_scheduled_send`（详见下方说明）