Skip to content

Commit 4f2ba4e

Browse files
author
mb
committed
fix: remove leftover merge conflict marker
1 parent f5562e8 commit 4f2ba4e

1 file changed

Lines changed: 0 additions & 1 deletion

File tree

packages/agent-core/src/mcp/connection-manager.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,6 @@ return {
475475
};
476476
}),
477477
};
478-
>>>>>>> 6f20830c5 (fix(agent-core): integrate sanitizeMcpSchema into connectAndDiscoverTools)
479478
}
480479

481480
private async closeClient(entry: InternalEntry): Promise<void> {

0 commit comments

Comments
 (0)