mirror of
https://github.com/XRPLF/xrpl-dev-portal.git
synced 2026-06-07 18:56:38 +00:00
a565ceb59d
Resolve all merge conflicts: - package.json: keep Bootstrap 5 + modern build toolchain - package-lock.json: accept branch version - .gitignore: keep both sides (css.map + go/java ignores) - .claude/settings.json, Navbar.tsx, events.page.tsx, community/index.page.tsx, xrp-faucets.page.tsx: resolved - styles/xrpl.scss: keep shared component imports - static/css/devportal2024-v1.css: regenerated from SCSS - Fix undefined $blue-purple-600 → $blue-purple-500 in _tutorials.scss and light/_light-theme.scss - styles/_feedback.scss: auto-merged Co-Authored-By: Oz <oz-agent@warp.dev>