Keep origin/main version for all 25 conflict sections: - README.md: 4 conflicts (bulletin timestamps, alert status) - docs/HoloLake-Era-OS-Modules.md: 8 conflicts (module metadata, file listings) - modules/M22-bulletin/index.html: 1 conflict (semantic header with i18n) - modules/M22-bulletin/style.css: 11 conflicts (CSS class naming, state styles) - modules/M22-bulletin/script.js: 1 conflict (IIFE pattern with dynamic rendering) Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> |
||
|---|---|---|
| .. | ||
| M22-bulletin | ||
| m-channel | ||
| portal | ||