castad
/
o2o-castad-backend
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix forgoten merge conflict

insta
jaehwang 2026-01-26 15:10:13 +09:00
parent 72dcd09771
commit fc88eedfa2
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/song/api/routers/v1/song.py
View File

@ -19,11 +19,7 @@ from sqlalchemy.ext.asyncio import AsyncSession
from app.database.session import get_session from app.database.session import get_session
from app.home.models import Project from app.home.models import Project
from app.lyric.models import Lyric from app.lyric.models import Lyric
<<<<<<< HEAD
from app.song.models import Song
=======
from app.song.models import Song, SongTimestamp from app.song.models import Song, SongTimestamp
>>>>>>> main
from app.song.schemas.song_schema import ( from app.song.schemas.song_schema import (
GenerateSongRequest, GenerateSongRequest,
GenerateSongResponse, GenerateSongResponse,