From 2d3af99c992ab1576b6a1cc61a813b211a3e6df0 Mon Sep 17 00:00:00 2001 From: Ray Tien Date: Fri, 30 Jan 2026 00:32:29 +0000 Subject: [PATCH] fix: resolve merge conflict in obsidian-daily SKILL.md --- skills/bastos/obsidian-daily/SKILL.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/skills/bastos/obsidian-daily/SKILL.md b/skills/bastos/obsidian-daily/SKILL.md index 4eb8587dc..c1a83a075 100644 --- a/skills/bastos/obsidian-daily/SKILL.md +++ b/skills/bastos/obsidian-daily/SKILL.md @@ -1,12 +1,10 @@ --- name: obsidian-daily description: Manage Obsidian Daily Notes via obsidian-cli. Create and open daily notes, append entries (journals, logs, tasks, links), read past notes by date, and search vault content. Handles relative dates like "yesterday", "last Friday", "3 days ago". Requires obsidian-cli installed via Homebrew (Mac/Linux) or Scoop (Windows). -<<<<<<< Updated upstream +license: MIT metadata: author: github.com/bastos version: "2.0" -======= ->>>>>>> Stashed changes --- # Obsidian Daily Notes