[2026-09-22 13:01:52] taiga-vault: resolve merge conflict markers in movies-watchlist.md (kraken vs eagle ❓/year normalization — kept both: eagle titles + kraken ★ subentries)

This commit is contained in:
Taiga committed 2026-09-22 13:01:52 +00:00
1 parent d6d992d8b1
commit 9a2220e84f
1 file changed
+5 -20
+5 -20
View File
@@ -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 (сериал)