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

Browse Source

...

This commit is contained in:

Alexey Martemyanov committed 2026-05-30 13:01:29 +06:00

2 parents 8a4663f1b2 adcb1501cd

commit 927cfbcf85

400 files changed

+2253

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

Executable → Regular

File mode changed.

family/_index.md

Executable → Regular

File mode changed.

family/contacts/birthdays.md

Executable → Regular

File mode changed.

family/contacts/service-providers.md

Executable → Regular

File mode changed.

family/contacts/services.md

Executable → Regular

File mode changed.

family/documents/altai-electricity-meter.md

Executable → Regular

File mode changed.

family/documents/altai-house-inventory.md

Executable → Regular

File mode changed.

family/documents/altai-shopping.md

Executable → Regular

File mode changed.

family/documents/books-reading-list.md

Executable → Regular

File mode changed.

family/documents/books-wishlist.md

Executable → Regular

File mode changed.

family/documents/bring-to-russia.md

Executable → Regular

File mode changed.

family/documents/car-notes.md

Executable → Regular

File mode changed.

family/documents/fasteners-nomenclature.md

Executable → Regular

File mode changed.

family/documents/flea-market-shopping.md

Executable → Regular

File mode changed.

family/documents/games-wishlist.md

Executable → Regular

File mode changed.

family/documents/gift-ideas.md

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/documents/hiking-packing-list.md

Executable → Regular

File mode changed.

family/documents/holiday-food.md

Executable → Regular

File mode changed.

family/documents/home-access-codes.md

Executable → Regular

File mode changed.

family/documents/home-automation-wishlist.md

Executable → Regular

File mode changed.

family/documents/home-wishlist.md

Executable → Regular

File mode changed.

family/documents/karaoke-songs.md

Executable → Regular

File mode changed.

family/documents/kids-activities.md

Executable → Regular

File mode changed.

family/documents/kids-songs.md

Executable → Regular

File mode changed.

family/documents/lerua-shopping.md

Executable → Regular

File mode changed.

family/documents/loyalty-cards.md

Executable → Regular

File mode changed.

family/documents/movies-watchlist.md

Executable → Regular

File mode changed.

family/documents/party-games.md

Executable → Regular

File mode changed.

family/documents/places-to-visit.md

Executable → Regular

File mode changed.

family/documents/recipes-wishlist.md

Executable → Regular

File mode changed.

family/documents/shopping-lists.md

Executable → Regular

File mode changed.

family/documents/shopping-order.md

Executable → Regular

File mode changed.

family/documents/trip-packing-list.md

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/documents/vault-sync/20260514.md

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/arduino-programming.md

Executable → Regular

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/gitea-config.md

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/home-automation.md

Executable → Regular

File mode changed.

family/how-to/htpc-access.md

Executable → Regular

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/htpc-magic4pc.md

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/htpc-system.md

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/htpc.md

Executable → Regular

File mode changed.

family/how-to/jellyfin-config.md

Regular → Executable

File mode changed.

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

Regular → Executable

File mode changed.

family/how-to/kraken-access.md

Executable → Regular

File mode changed.

family/how-to/kraken-network.md

Regular → Executable

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/magic4pc-webos.md

Executable → Regular

File mode changed.

family/how-to/mesh-networks.md

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/nodered-ventilation.md

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/obsidian-sync.md

Executable → Regular

File mode changed.

family/how-to/openmediavault-rpi5.md

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/samsung.md

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/truenas-access.md

Executable → Regular

File mode changed.

family/how-to/truenas-infrastructure.md

Executable → Regular

File mode changed.

family/how-to/truenas-inpxer.md

Regular → Executable

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Regular → Executable

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/vps-qentra.md

Regular → Executable

File mode changed.

family/how-to/wireguard-vpn.md

Executable → Regular

File mode changed.

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

Executable → Regular

File mode changed.

family/how-to/xgimi-play6.md

Executable → Regular

File mode changed.

family/how-to/xiaomi-wifi-fix.md

Executable → Regular

File mode changed.

family/index.md

Executable → Regular

File mode changed.

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