From 563a7fc233214e2cf0d951be0f86faa9e0691337 Mon Sep 17 00:00:00 2001
From: Taiga <taiga@hermes>
Date: Sat, 26 Sep 2026 11:02:15 +0000
Subject: [PATCH] =?UTF-8?q?taiga-vault:=20resolve=20merge=20conflict=20mar?=
 =?UTF-8?q?kers=20in=20personal/plans/music-tags-review/1-needs-decision.m?=
 =?UTF-8?q?d=20(union:=20nas/phone=20side=20kept=20=E2=80=94=20Alexey's=20?=
 =?UTF-8?q?[x]=20decisions=20and=20pending=20!=D0=94=D0=B5=D1=82=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B8=D0=B5=20item=20preserved,=20nothing=20deleted)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 personal/plans/music-tags-review/1-needs-decision.md | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/personal/plans/music-tags-review/1-needs-decision.md b/personal/plans/music-tags-review/1-needs-decision.md
index c00e6f04..de0acfb5 100755
--- a/personal/plans/music-tags-review/1-needs-decision.md
+++ b/personal/plans/music-tags-review/1-needs-decision.md
@@ -8,14 +8,12 @@ status: awaiting-approval
 
 # Требует решения
 
-**Файлов:** 1
+**Файлов:** 4
 
 > [!info] Исполнителя неоткуда взять — теги уничтожены, в путях его нет.
 
 [[music-tags-review|← к обзору]]
 
-<<<<<<< HEAD
-=======
 ## !A Not sorted
 
 `!A Not sorted` — 1 файлов
@@ -29,16 +27,10 @@ status: awaiting-approval
     - `artist`: Kazantip 2008
     - title: Beat
 
->>>>>>> nas/main
 ## !Pop, Club, Любэ/!Radio/y OOF
 
 `!Pop, Club, Любэ/!Radio/y OOF` — 1 файлов
 
-<<<<<<< HEAD
-- [ ] **i am instructor.mp3**
-    - `title`: — → **i am instructor**
-    - _title<-filename_
-=======
 - [x] **i am instructor.mp3**
     - `title`: — → **I am instructor**
     - artist: Techno Beat
@@ -52,4 +44,3 @@ status: awaiting-approval
     - `artist`: Íåèçâåñòíûé èñïîëíèòåëü → **—**
     - `album`: Íåèçâåñòíîå íàçâàíèå → **—**
     - _encoding/cleanup only_
->>>>>>> nas/main