eric/mcp-obsidian
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: remove leftover merge markers in tools.py

Browse Source
This commit is contained in:
Eric X. Liu
2025-08-16 19:01:28 +00:00
parent 8bca179ba5
commit 00245ef40b
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mcp_obsidian/tools.py
View File

@@ -541,13 +541,8 @@ class PeriodicNotesToolHandler(ToolHandler):
if type not in valid_types: if type not in valid_types:
raise RuntimeError(f"Invalid type: {type}. Must be one of: {', '.join(valid_types)}") raise RuntimeError(f"Invalid type: {type}. Must be one of: {', '.join(valid_types)}")
<<<<<<< ours
api = create_obsidian_api() api = create_obsidian_api()
content = api.get_periodic_note(period) content = api.get_periodic_note(period)
=======
api = create_obsidian_api()
content = api.get_periodic_note(period)
>>>>>>> theirs
return [ return [
TextContent( TextContent(