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

Browse Source

...

This commit is contained in:

Alexey Martemyanov

2026-05-30 13:01:29 +06:00

parent 8a4663f1b2 adcb1501cd

commit 927cfbcf85

400 changed files with 2253 additions and 0 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

Executable → Regular

family/_index.md

Executable → Regular

family/contacts/birthdays.md

Executable → Regular

family/contacts/service-providers.md

Executable → Regular

family/contacts/services.md

Executable → Regular

family/documents/altai-electricity-meter.md

Executable → Regular

family/documents/altai-house-inventory.md

Executable → Regular

family/documents/altai-shopping.md

Executable → Regular

family/documents/books-reading-list.md

Executable → Regular

family/documents/books-wishlist.md

Executable → Regular

family/documents/bring-to-russia.md

Executable → Regular

family/documents/car-notes.md

Executable → Regular

family/documents/fasteners-nomenclature.md

Executable → Regular

family/documents/flea-market-shopping.md

Executable → Regular

family/documents/games-wishlist.md

Executable → Regular

family/documents/gift-ideas.md

Executable → Regular

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

Executable → Regular

family/documents/hiking-packing-list.md

Executable → Regular

family/documents/holiday-food.md

Executable → Regular

family/documents/home-access-codes.md

Executable → Regular

family/documents/home-automation-wishlist.md

Executable → Regular

family/documents/home-wishlist.md

Executable → Regular

family/documents/karaoke-songs.md

Executable → Regular

family/documents/kids-activities.md

Executable → Regular

family/documents/kids-songs.md

Executable → Regular

family/documents/lerua-shopping.md

Executable → Regular

family/documents/loyalty-cards.md

Executable → Regular

family/documents/movies-watchlist.md

Executable → Regular

family/documents/party-games.md

Executable → Regular

family/documents/places-to-visit.md

Executable → Regular

family/documents/recipes-wishlist.md

Executable → Regular

family/documents/shopping-lists.md

Executable → Regular

family/documents/shopping-order.md

Executable → Regular

family/documents/trip-packing-list.md

Executable → Regular

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

Executable → Regular

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

Executable → Regular

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

Executable → Regular

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

Executable → Regular

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

Executable → Regular

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

Executable → Regular

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

Executable → Regular

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

Executable → Regular

family/documents/vault-sync/20260514.md

Executable → Regular

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

Executable → Regular

family/how-to/arduino-programming.md

Executable → Regular

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

Regular → Executable

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

Regular → Executable

family/how-to/gitea-config.md

Regular → Executable

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

Regular → Executable

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

Regular → Executable

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

Regular → Executable

family/how-to/home-automation.md

Executable → Regular

family/how-to/htpc-access.md

Executable → Regular

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

Regular → Executable

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

Regular → Executable

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

Regular → Executable

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

Executable → Regular

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

Executable → Regular

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

Regular → Executable

family/how-to/htpc-magic4pc.md

Executable → Regular

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

Executable → Regular

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

Executable → Regular

family/how-to/htpc-system.md

Executable → Regular

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

Executable → Regular

family/how-to/htpc.md

Executable → Regular

family/how-to/jellyfin-config.md

Regular → Executable

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

Regular → Executable

family/how-to/kraken-access.md

Executable → Regular

family/how-to/kraken-network.md

Regular → Executable

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

Executable → Regular

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

Executable → Regular

family/how-to/magic4pc-webos.md

Executable → Regular

family/how-to/mesh-networks.md

Executable → Regular

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

Executable → Regular

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

Executable → Regular

family/how-to/nodered-ventilation.md

Executable → Regular

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

Executable → Regular

family/how-to/obsidian-sync.md

Executable → Regular

family/how-to/openmediavault-rpi5.md

Executable → Regular

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

Executable → Regular

family/how-to/samsung.md

Executable → Regular

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

Executable → Regular

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

Executable → Regular

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

Executable → Regular

family/how-to/truenas-access.md

Executable → Regular

family/how-to/truenas-infrastructure.md

Executable → Regular

family/how-to/truenas-inpxer.md

Regular → Executable

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

Executable → Regular

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

Executable → Regular

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

Regular → Executable

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

Executable → Regular

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

Executable → Regular

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

Executable → Regular

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

Executable → Regular

family/how-to/vps-qentra.md

Regular → Executable

family/how-to/wireguard-vpn.md

Executable → Regular

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

Executable → Regular

family/how-to/xgimi-play6.md

Executable → Regular

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

Executable → Regular

family/index.md

Executable → Regular

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