Se resuelve conflicto

supabase/config.toml

@@ -49,11 +49,10 @@ entrypoint = "./functions/generate-subject-suggestions/index.ts"
 # For example, if you want to serve static HTML pages in your function:
 # static_files = [ "./functions/generate-subject-suggestions/*.html" ]
 
-<<<<<<< HEAD
 [auth.hook.custom_access_token]
 enabled = true
 uri = "pg-functions://postgres/public/custom_access_token_hook"
-=======
+
 [functions.openai-webhook-responses]
 enabled = true
 verify_jwt = true
@@ -64,4 +63,3 @@ entrypoint = "./functions/openai-webhook-responses/index.ts"
 # Specifies static files to be bundled with the function. Supports glob patterns.
 # For example, if you want to serve static HTML pages in your function:
 # static_files = [ "./functions/openai-webhook-responses/*.html" ]
->>>>>>> d7312d2ab35d71953572b570595b84cab1804dfc