From fc88eedfa2f2894e1381746e2a0f74d059d11da4 Mon Sep 17 00:00:00 2001 From: jaehwang Date: Mon, 26 Jan 2026 15:10:13 +0900 Subject: [PATCH] fix forgoten merge conflict --- app/song/api/routers/v1/song.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/song/api/routers/v1/song.py b/app/song/api/routers/v1/song.py index 486d7ab..13b39f3 100644 --- a/app/song/api/routers/v1/song.py +++ b/app/song/api/routers/v1/song.py @@ -19,11 +19,7 @@ from sqlalchemy.ext.asyncio import AsyncSession from app.database.session import get_session from app.home.models import Project from app.lyric.models import Lyric -<<<<<<< HEAD -from app.song.models import Song -======= from app.song.models import Song, SongTimestamp ->>>>>>> main from app.song.schemas.song_schema import ( GenerateSongRequest, GenerateSongResponse,