Skip to content

Commit 7fe7267

Browse files
Merge pull request #154 from d-barletta/patch-1
Fix merge conflict in README.md
2 parents f6b95d9 + 9782460 commit 7fe7267

File tree

1 file changed

+1
-3
lines changed

1 file changed

+1
-3
lines changed

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,9 @@ The repository ships several demo MCP servers that highlight different widget bu
111111

112112
- **Pizzaz (Node & Python)** – pizza-inspired collection of tools and components
113113
- **Solar system (Python)** – 3D solar system viewer
114-
<<<<<<< HEAD
115-
- # **Authenticated (Python)** – set of tools that require different levels of OAuth
114+
- **Authenticated (Python)** – set of tools that require different levels of OAuth
116115
- **Kitchen sink lite (Node & Python)** – minimal widget + server pairing that demonstrates tool output, widget state, `callTool`, and host helpers
117116
- **Shopping cart (Python)** – simple shopping cart widget that demonstrates how to use `widgetSessionId` to keep state between tool calls
118-
> > > > > > > 1243be83efb820fcc288f7359bb67446e14b74ec
119117

120118
### Pizzaz Node server
121119

0 commit comments

Comments
 (0)