From 9a2220e84f35bf78c9803dab848ddf27ce3cc237 Mon Sep 17 00:00:00 2001
From: Taiga <taiga@hermes>
Date: Tue, 22 Sep 2026 13:01:52 +0000
Subject: [PATCH] =?UTF-8?q?[2026-09-22=2013:01:52]=20taiga-vault:=20resolv?=
 =?UTF-8?q?e=20merge=20conflict=20markers=20in=20movies-watchlist.md=20(kr?=
 =?UTF-8?q?aken=20vs=20eagle=20=E2=9D=93/year=20normalization=20=E2=80=94?=
 =?UTF-8?q?=20kept=20both:=20eagle=20titles=20+=20kraken=20=E2=98=85=20sub?=
 =?UTF-8?q?entries)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 family/documents/movies-watchlist.md | 25 +++++--------------------
 1 file changed, 5 insertions(+), 20 deletions(-)

diff --git a/family/documents/movies-watchlist.md b/family/documents/movies-watchlist.md
index 2c733484..9d0b6f26 100644
--- a/family/documents/movies-watchlist.md
+++ b/family/documents/movies-watchlist.md
@@ -83,13 +83,9 @@ related:
     - Вавилон (2022) ★7.3
     - Babylon (2019) ★6.0
     - Babylon (2004) ★0.0(2022)
-<<<<<<< HEAD
-  - [ ] Everything Everywhere All at Once 2021
+  - [ ] Everything Everywhere All at Once 2022
     - Всё везде и сразу (2022) ★7.7
     - Almost Everything You Ever Wanted to Know About Everything Everywhere All at Once (2022) ★10.0
-=======
-  - [ ] Everything Everywhere All at Once 2022
->>>>>>> origin/main
   - [ ] Скотный двор 2026
   - [ ] STANS
   - [ ] 🧟‍♀️ [Грешники](https://www.kinopoisk.ru/film/5499518/) (2025) IMDb 7.5 KP 6.7
@@ -167,15 +163,10 @@ related:
   - [ ] Рики бобби король дороги
   - [ ] Волшебный участок
   - [ ] Трансформеры начало
-<<<<<<< HEAD
-  - [ ] ❓ Спрут сериал
-  - [ ] Духless
-    - Духless (2012) ★5.8
-    - Духless 2 (2015) ★5.5
-=======
   - [ ] Спрут сериал
   - [ ] Духless 2012
->>>>>>> origin/main
+    - Духless (2012) ★5.8
+    - Духless 2 (2015) ★5.5
   - [ ] 🧟‍♀️ Дракула 2025
   - [ ] 🧟‍♀️ Вивариум
   - [ ] Ворон 1994
@@ -220,17 +211,11 @@ related:
   - [ ] ❓ Space merchants
   - [ ] ❓ All systems red
   - [ ] Transformers one
-<<<<<<< HEAD
-  - [ ] ❓ Идиот Бортко
-  - [ ] ❓ Замок Балабанов
-  - [ ] Бумбараш
-    - Бумбараш (1972) ★5.8
-    - Бумбараш (1972) ★0.0
-=======
   - [ ] Идиот Бортко
   - [ ] Замок Балабанов
   - [ ] Бумбараш 1972
->>>>>>> origin/main
+    - Бумбараш (1972) ★5.8
+    - Бумбараш (1972) ★0.0
   - [ ] 🧟‍♀️ Bram Stoker's Dracula 1992
   - [ ] Van Helsing
   - [ ] ❓ Hemlock Grove (сериал)