Marcus Summers ef91865f88 wiki: resolve Obsidian Sync timestamp conflicts ... 5 files had stale unmerged index entries from a prior aborted merge — working tree was already clean (no conflict markers), differences were purely `updated:` field timestamps that drifted across machines via Obsidian Sync. Working-tree timestamps (most recent) are kept as the resolution. Sixth file (mastodon-instance-tuning.md) preserves staged S3 cache management content that a working-tree revert would have lost. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>		2026-04-25 12:57:39 -04:00
..
fail2ban-imap-self-ban-mail-client.md	wiki: audit fixes — broken links, wikilinks, frontmatter, stale content (66 files)	2026-04-02 11:16:29 -04:00
fail2ban-self-ban-apache-outage.md	wiki: audit fixes — broken links, wikilinks, frontmatter, stale content (66 files)	2026-04-02 11:16:29 -04:00
fail2ban-ufw-rule-bloat-cleanup.md	wiki: audit fixes — broken links, wikilinks, frontmatter, stale content (66 files)	2026-04-02 11:16:29 -04:00
firewalld-mail-ports-reset.md	wiki: audit fixes — broken links, wikilinks, frontmatter, stale content (66 files)	2026-04-02 11:16:29 -04:00
pihole-blocks-claude-desktop.md	docs: add Pi-hole AI blocklist / claude.ai ERR_CONNECTION_REFUSED article	2026-04-22 18:12:08 -04:00
tailscale-ssh-reauth-prompt.md	wiki: audit fixes — broken links, wikilinks, frontmatter, stale content (66 files)	2026-04-02 11:16:29 -04:00
windows-openssh-wsl-default-shell-breaks-remote-commands.md	wiki: resolve Obsidian Sync timestamp conflicts	2026-04-25 12:57:39 -04:00
windows-sshd-stops-after-reboot.md	wiki: resolve Obsidian Sync timestamp conflicts	2026-04-25 12:57:39 -04:00