fix: remove leftover merge markers in tools.py

2025-08-16 19:01:28 +00:00
parent 8bca179ba5
commit 00245ef40b
1 changed files with 0 additions and 5 deletions
--- a/src/mcp_obsidian/tools.py
+++ b/src/mcp_obsidian/tools.py
@@ -541,13 +541,8 @@ class PeriodicNotesToolHandler(ToolHandler):
        if type not in valid_types:
            raise RuntimeError(f"Invalid type: {type}. Must be one of: {', '.join(valid_types)}")

-<<<<<<< ours
        api = create_obsidian_api()
        content = api.get_periodic_note(period)
-=======
-        api = create_obsidian_api()
-        content = api.get_periodic_note(period)
->>>>>>> theirs

        return [
            TextContent(