chore: clean up merge leftovers

ognis1205 · ognis1205 · commit e18de62da431 · 2025-06-13T12:10:36.000+09:00
Signed-off-by: Shingo OKAWA &lt;shingo.okawa.g.h.c@gmail.com&gt;
diff --git a/.github/actions/spelling/allow.txt b/.github/actions/spelling/allow.txt
@@ -37,18 +37,15 @@ httpapi
 ietf
 inmemory
 kwarg
-langgraph
+langgraphga
 lifecycles
 linkset
 linting
 lstrips
 mockurl
 oauthoidc
-<<<<<<< HEAD
 ognis
-=======
 oidc
->>>>>>> upstream/main
 opensource
 poc
 protoc
