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

Browse Source

...

This commit is contained in:

Alexey Martemyanov committed 2026-05-30 14:01:09 +06:00

2 parents 009c61d1d7 70205779ee

commit 40c33a6484

409 files changed

+8 -286

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

No files matched your search

.stfolder/syncthing-folder-940f59.txt

Regular → Executable

File mode changed.

family/_index.md

Regular → Executable

File mode changed.

family/contacts/birthdays.md

Regular → Executable

File mode changed.

family/contacts/builders.md

Regular → Executable

File mode changed.

family/contacts/service-providers.md

Regular → Executable

File mode changed.

family/contacts/services.md

Regular → Executable

File mode changed.

family/documents/altai-electricity-meter.md

Regular → Executable

File mode changed.

family/documents/altai-house-inventory.md

Regular → Executable

File mode changed.

family/documents/altai-shopping.md

Regular → Executable

File mode changed.

family/documents/books-reading-list.md

Regular → Executable

File mode changed.

family/documents/books-wishlist.md

Regular → Executable

File mode changed.

family/documents/bring-to-russia.md

Regular → Executable

File mode changed.

family/documents/car-notes.md

Regular → Executable

File mode changed.

family/documents/fasteners-nomenclature.md

Regular → Executable

File mode changed.

family/documents/flea-market-shopping.md

Regular → Executable

File mode changed.

family/documents/games-wishlist.md

Regular → Executable

File mode changed.

family/documents/gift-ideas.md

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/documents/hiking-packing-list.md

Regular → Executable

File mode changed.

family/documents/holiday-food.md

Regular → Executable

File mode changed.

family/documents/home-access-codes.md

Regular → Executable

File mode changed.

family/documents/home-automation-wishlist.md

Regular → Executable

File mode changed.

family/documents/home-wishlist.md

Regular → Executable

File mode changed.

family/documents/karaoke-songs.md

Regular → Executable

File mode changed.

family/documents/kids-activities.md

Regular → Executable

File mode changed.

family/documents/kids-songs.md

Regular → Executable

File mode changed.

family/documents/lerua-shopping.md

Regular → Executable

File mode changed.

family/documents/loyalty-cards.md

Regular → Executable

File mode changed.

family/documents/medications.md

Regular → Executable

File mode changed.

family/documents/movies-watchlist.md

Regular → Executable

File mode changed.

family/documents/party-games.md

Regular → Executable

File mode changed.

family/documents/places-to-visit.md

Regular → Executable

File mode changed.

family/documents/recipes-wishlist.md

Regular → Executable

File mode changed.

family/documents/shopping-lists.md

Regular → Executable

File mode changed.

family/documents/shopping-order.md

Regular → Executable

File mode changed.

family/documents/trip-packing-list.md

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/documents/vault-sync/20260514.md

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/arduino-programming.md

Regular → Executable

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/gitea-config.md

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/home-automation.md

Regular → Executable

File mode changed.

family/how-to/htpc-access.md

Regular → Executable

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/htpc-magic4pc.md

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/htpc-system.md

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/htpc.md

Regular → Executable

File mode changed.

family/how-to/jellyfin-config.md

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/kraken-access.md

Regular → Executable

File mode changed.

family/how-to/kraken-network.md

Executable → Regular

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/magic4pc-webos.md

Regular → Executable

File mode changed.

family/how-to/mesh-networks.md

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/nodered-ventilation.md

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/obsidian-sync.md

Regular → Executable

File mode changed.

family/how-to/openmediavault-rpi5.md

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/samsung.md

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/truenas-access.md

Regular → Executable

File mode changed.

family/how-to/truenas-infrastructure.md

Regular → Executable

File mode changed.

family/how-to/truenas-inpxer.md

Executable → Regular

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Executable → Regular

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/vps-qentra.md

Executable → Regular

File mode changed.

family/how-to/wireguard-vpn.md

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/xgimi-play6.md

Regular → Executable

File mode changed.

Loaded 100 of 409 files, more files were not shown because too many files have changed in this diff. Show more