starred/servers-modelcontextprotocol-1
1
0
Fork 0
mirror of https://github.com/modelcontextprotocol/servers.git synced 2026-04-18 16:23:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts by accepting main branch changes

Browse Source 
Co-authored-by: olaservo <16480113+olaservo@users.noreply.github.com>
This commit is contained in:
copilot-swe-agent[bot]
2026-01-17 18:08:53 +00:00
parent dd9c5e59e0
commit 68fbd87e94
2 changed files with 0 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/time/pyproject.toml
View File

@@ -17,17 +17,10 @@ classifiers = [
"Programming Language :: Python :: 3.10",
]
dependencies = [
<<<<<<< HEAD
"mcp>=1.0.0",
"pydantic>=2.0.0",
"tzdata>=2024.2",
"tzlocal>=5.3.1"
=======
"mcp>=1.23.0",
"pydantic>=2.0.0",
"tzdata>=2024.2",
"tzlocal>=5.3.1",
>>>>>>> origin/main
]
[project.scripts]