resolves merges

Joel Coutinho · Joel Coutinho · commit 8c50ebad1d31 · 2025-10-30T15:21:54.000+05:30
diff --git a/static/blog-seo/sitemapconfig.json b/static/blog-seo/sitemapconfig.json
@@ -311,8 +311,6 @@
     {
         "location": "https://supertokens.com/blog/biometric-auth"
     },
-<<<<<<< HEAD
-=======
     {    
         "location": "https://supertokens.com/blog/oidc-vs-saml"
     },
@@ -322,7 +320,6 @@
     {    
         "location": "https://supertokens.com/blog/oauth-grant-types-explained"
     },
->>>>>>> a45722a2060e1b05226c85dc9d468c5a3c97b706
     {
         "location": "https://supertokens.com/blog/firebase-pricing"
     },

Original file line number	Diff line number	Diff line change
`@@ -311,8 +311,6 @@`
`311`	`311`	`{`
`312`	`312`	`"location": "https://supertokens.com/blog/biometric-auth"`
`313`	`313`	`},`
`314`		`-<<<<<<< HEAD`
`315`		`-=======`
`316`	`314`	`{`
`317`	`315`	`"location": "https://supertokens.com/blog/oidc-vs-saml"`
`318`	`316`	`},`
`@@ -322,7 +320,6 @@`
`322`	`320`	`{`
`323`	`321`	`"location": "https://supertokens.com/blog/oauth-grant-types-explained"`
`324`	`322`	`},`
`325`		`->>>>>>> a45722a2060e1b05226c85dc9d468c5a3c97b706`
`326`	`323`	`{`
`327`	`324`	`"location": "https://supertokens.com/blog/firebase-pricing"`
`328`	`325`	`},`