#73 Resolve stray merge-conflict markers in README

[Anonymous]

Originally created by: kristofferR

An earlier merge into main (via feature/diagnostics-observability) landed with unresolved git conflict markers committed into README.md — visible in the Features and Keyboard-shortcuts sections on the public repo. This resolves them against the current code.

Resolution (verified against source)

• Settings list — kept page zoom (zoom in settings.rs), global hotkey (global_hotkey in settings.rs / hotkey.rs), and the Diagnostics log bullet (Settings → Advanced → Open log folder), since all three features exist.
• Hide Names & Avatars shortcut is Cmd/Ctrl+Shift+H, not Shift+N — menu.rs:97 sets CmdOrCtrl+Shift+H with the comment "Shift+N belongs to New Conversation". Kept the Cmd/Ctrl+Shift+M global-hotkey line (hotkey.rs:10).

No conflict markers remain in the tree. Docs-only change.

https://claude.ai/code/session_01RJBYpVt2zj2i3defSHFuvj

Summary by CodeRabbit

• Documentation
• Clarified the README’s feature list and Settings window description.
• Added the global hotkey option to the list of available settings.
• Confirmed the Diagnostics log entry remains visible in the Settings section.
• Updated keyboard shortcut documentation so Hide names & avatars now uses Cmd/Ctrl + Shift + H.

[Anonymous]

Originally posted by: kristofferR

@coderabbitai review

[Anonymous]

Originally posted by: coderabbitai[bot]

✅ Action performed

Review finished. > Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

[Anonymous]

Originally posted by: coderabbitai[bot]

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info

⚙️ Run configuration

**Configuration used**: Path: .coderabbit.yaml **Review profile**: ASSERTIVE **Plan**: Pro **Run ID**: `ca82d5ac-a694-4991-946a-50cbb0f06ac8`

📥 Commits

Reviewing files that changed from the base of the PR and between [2c3d95] and 4115d1e2355504df42885d8a69d3d4080528c401.

📒 Files selected for processing (1)

* `README.md`

---

📝 Walkthrough

## Walkthrough This PR updates README.md documentation only: it consolidates conflicting text in the Settings window feature bullet to include the global hotkey option, and changes the documented keyboard shortcut for hiding names & avatars from Cmd/Ctrl+Shift+N to Cmd/Ctrl+Shift+H. ### Changes **README updates** |Layer / File(s)|Summary| |---|---| |**Settings and shortcuts documentation**
`README.md`|Consolidates the Settings window (F3) feature bullet to include the global hotkey option, and updates the hide names & avatars shortcut from Cmd/Ctrl+Shift+N to Cmd/Ctrl+Shift+H.| **Estimated code review effort:** 1 (Trivial) | ~2 minutes **Possibly related PRs** - [[kristofferR/Carrier#42](https://github.com/kristofferR/Carrier/issues/42)](https://github.com/kristofferR/Carrier/pull/42): Both PRs update the "Hide Names & Avatars" shortcut documentation to use Cmd/Ctrl+Shift+H instead of Cmd/Ctrl+Shift+N.

🚥 Pre-merge checks | ✅ 5

✅ Passed checks (5 passed)

| Check name | Status | Explanation | | :------------------------: | :------- | :--------------------------------------------------------------------------------------------------------- | | Description Check | ✅ Passed | Check skipped - CodeRabbit’s high-level summary is enabled. | | Title check | ✅ Passed | The title clearly matches the main docs-only change: removing merge-conflict remnants from README.md. | | Docstring Coverage | ✅ Passed | No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. | | Linked Issues check | ✅ Passed | Check skipped because no linked issues were found for this pull request. | | Out of Scope Changes check | ✅ Passed | Check skipped because no linked issues were found for this pull request. |

✨ Finishing Touches

🧪 Generate unit tests (beta)

- [ ] Create PR with unit tests - [ ] Commit unit tests in branch `fix/readme-conflict-markers`

---

_{Comment @coderabbitai help to get the list of available commands.}

[Anonymous]

Ticket changed by: kristofferR

• status: open --> closed