Resolve unresolved merge conflict markers left in main
The merge of claude/nifty-bhaskara-fb3ec2 left three-way conflict markers committed straight into index.html, _headers, and .claude/launch.json instead of being resolved. Two branches had independently fixed the same duplicate-CSP bug; keep the more thorough fix (single CSP source of truth in _headers, no meta tag in index.html, local photo path) and drop the now-unneeded 'unsafe-inline'/ki5bhv.com allowances.
This commit is contained in:
1 parent
c31ba229af
commit
5b35c52d58
3 files changed
-26
No files matched your search
@@ -1,13 +1,5 @@
|
||||
/*
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
Content-Security-Policy: default-src 'self'; script-src 'self' https://static.cloudflareinsights.com; style-src 'self' https://fonts.googleapis.com 'unsafe-inline'; font-src 'self' https://fonts.gstatic.com; img-src 'self' data:; connect-src 'self' https://cloudflareinsights.com; object-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'self'; upgrade-insecure-requests
|
||||
=======
|
||||
Content-Security-Policy: default-src 'self'; script-src 'self' https://static.cloudflareinsights.com; style-src 'self' https://fonts.googleapis.com 'unsafe-inline'; font-src 'self' https://fonts.gstatic.com; img-src 'self' https://ki5bhv.com data:; connect-src 'self' https://cloudflareinsights.com; object-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'self'; upgrade-insecure-requests
|
||||
>>>>>>> c7a10ae71906680d14e62b25c702ac21e5067a7f
|
||||
=======
|
||||
Content-Security-Policy: default-src 'self'; script-src 'self' 'unsafe-inline' https://static.cloudflareinsights.com; style-src 'self' https://fonts.googleapis.com 'unsafe-inline'; font-src 'self' https://fonts.gstatic.com; img-src 'self' https://ki5bhv.com data:; connect-src 'self' https://cloudflareinsights.com; object-src 'none'; base-uri 'none'; frame-ancestors 'none'; form-action 'self'; upgrade-insecure-requests
|
||||
>>>>>>> 6cea0312d23f660964b44ad3b2a6f18619d0b10b
|
||||
X-Content-Type-Options: nosniff
|
||||
X-Frame-Options: DENY
|
||||
Referrer-Policy: strict-origin-when-cross-origin
|
||||
|
||||
Reference in new issue
Block a user