[2026-05-30] sync: merge conflicts present — manual review needed

Browse Source

...

This commit is contained in:

Alexey Martemyanov

2026-05-30 14:01:09 +06:00

parent 009c61d1d7 70205779ee

commit 40c33a6484

409 changed files with 8 additions and 286 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

.stfolder/syncthing-folder-940f59.txt

Regular → Executable

family/_index.md

Regular → Executable

family/contacts/birthdays.md

Regular → Executable

family/contacts/builders.md

Regular → Executable

family/contacts/service-providers.md

Regular → Executable

family/contacts/services.md

Regular → Executable

family/documents/altai-electricity-meter.md

Regular → Executable

family/documents/altai-house-inventory.md

Regular → Executable

family/documents/altai-shopping.md

Regular → Executable

family/documents/books-reading-list.md

Regular → Executable

family/documents/books-wishlist.md

Regular → Executable

family/documents/bring-to-russia.md

Regular → Executable

family/documents/car-notes.md

Regular → Executable

family/documents/fasteners-nomenclature.md

Regular → Executable

family/documents/flea-market-shopping.md

Regular → Executable

family/documents/games-wishlist.md

Regular → Executable

family/documents/gift-ideas.md

Regular → Executable

family/documents/google-books-api-key.md

Regular → Executable

family/documents/hiking-packing-list.md

Regular → Executable

family/documents/holiday-food.md

Regular → Executable

family/documents/home-access-codes.md

Regular → Executable

family/documents/home-automation-wishlist.md

Regular → Executable

family/documents/home-wishlist.md

Regular → Executable

family/documents/karaoke-songs.md

Regular → Executable

family/documents/kids-activities.md

Regular → Executable

family/documents/kids-songs.md

Regular → Executable

family/documents/lerua-shopping.md

Regular → Executable

family/documents/loyalty-cards.md

Regular → Executable

family/documents/medications.md

Regular → Executable

family/documents/movies-watchlist.md

Regular → Executable

family/documents/party-games.md

Regular → Executable

family/documents/places-to-visit.md

Regular → Executable

family/documents/recipes-wishlist.md

Regular → Executable

family/documents/shopping-lists.md

Regular → Executable

family/documents/shopping-order.md

Regular → Executable

family/documents/trip-packing-list.md

Regular → Executable

family/documents/vault-sync-2026-05-13-08-01.md

Regular → Executable

family/documents/vault-sync-2026-05-20.md

Regular → Executable

family/documents/vault-sync-2026-05-21.md

Regular → Executable

family/documents/vault-sync-summary-2026-05-22.md

Regular → Executable

family/documents/vault-sync/2026-05-13-sync.md

Regular → Executable

family/documents/vault-sync/2026-05-15-sync.md

Regular → Executable

family/documents/vault-sync/2026-05-22-vault-sync.md

Regular → Executable

family/documents/vault-sync/2026-05-23.md

Regular → Executable

family/documents/vault-sync/20260514.md

Regular → Executable

family/documents/книги-ребенку.md

Regular → Executable

family/how-to/arduino-programming.md

Regular → Executable

family/how-to/arr-stack-kraken.md

Executable → Regular

family/how-to/arr-stack-taiga.md

Executable → Regular

family/how-to/gitea-config.md

Executable → Regular

family/how-to/hermes-docker-kraken.md

Executable → Regular

family/how-to/hermes-eagle-mac.md

Executable → Regular

family/how-to/hermes-kraken-api.md

Executable → Regular

family/how-to/home-automation.md

Regular → Executable

family/how-to/htpc-access.md

Regular → Executable

family/how-to/htpc-bazzite-ecosystem.md

Executable → Regular

family/how-to/htpc-bazzite-proton.md

Executable → Regular

family/how-to/htpc-discworld-noir-nq.md

Executable → Regular

family/how-to/htpc-emulators-setup.md

Regular → Executable

family/how-to/htpc-gaming-plans.md

Regular → Executable

family/how-to/htpc-kodi-layout.md

Executable → Regular

family/how-to/htpc-magic4pc.md

Regular → Executable

family/how-to/htpc-migration-plan.md

Regular → Executable

family/how-to/htpc-steam-nonsteam-shortcuts.md

Regular → Executable

family/how-to/htpc-system.md

Regular → Executable

family/how-to/htpc-webos-luna.md

Regular → Executable

family/how-to/htpc.md

Regular → Executable

family/how-to/jellyfin-config.md

Executable → Regular

family/how-to/jellyfin-transcode-rpi5.md

Executable → Regular

family/how-to/kraken-access.md

Regular → Executable

family/how-to/kraken-network.md

Executable → Regular

family/how-to/kraken-portainer-access.md

Regular → Executable

family/how-to/lg-remote-keys.md

Regular → Executable

family/how-to/magic4pc-webos.md

Regular → Executable

family/how-to/mesh-networks.md

Regular → Executable

family/how-to/mp3-bluetooth-remote.md

Regular → Executable

family/how-to/navidrome-truenas-android.md

Regular → Executable

family/how-to/nodered-ventilation.md

Regular → Executable

family/how-to/obsidian-android-sync.md

Regular → Executable

family/how-to/obsidian-sync.md

Regular → Executable

family/how-to/openmediavault-rpi5.md

Regular → Executable

family/how-to/router-bishkek-asus.md

Regular → Executable

family/how-to/samsung.md

Regular → Executable

family/how-to/speaker-sd-card-music.md

Regular → Executable

family/how-to/switch-emulation-rom-infra.md

Regular → Executable

family/how-to/syncthing-truenas-android.md

Regular → Executable

family/how-to/truenas-access.md

Regular → Executable

family/how-to/truenas-infrastructure.md

Regular → Executable

family/how-to/truenas-inpxer.md

Executable → Regular

family/how-to/truenas-rclone-backup.md

Regular → Executable

family/how-to/tv-luna-send.md

Regular → Executable

family/how-to/vault-git-sync.md

Executable → Regular

family/how-to/vault-sync-log-2026-05-15.md

Regular → Executable

family/how-to/vault-sync-logs/2026-05-14.md

Regular → Executable

family/how-to/vault-sync-summary.md

Regular → Executable

family/how-to/virtual-keyboard-bazzite.md

Regular → Executable

family/how-to/vps-qentra.md

Executable → Regular

family/how-to/wireguard-vpn.md

Regular → Executable

family/how-to/xgimi-play6-setup.md

Regular → Executable

family/how-to/xgimi-play6.md

Regular → Executable

Some files were not shown because too many files have changed in this diff Show More