Merge upstream/main: resolve conflict between session-watcher and pntr-cli entries

Browse Source

Keep both entries in alphabetical order (nomadop < oddunits).
Preserve the session-watcher entry from add-session-watcher branch
and the pntr-cli entry from upstream/main.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

...

This commit is contained in:

NOMADOP-LENOVO\nomad

2026-07-29 10:05:28 +08:00

parent 9bcc18e0d2 d0bf1db2bb

commit 7d29bbb828

8 changed files with 295 additions and 7 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

README.md

+287 -7

File diff suppressed because it is too large Load Diff