fix. 머지 충돌 수정

Browse Source

Made-with: Cursor

...

This commit is contained in:

clkim

2026-02-27 15:46:27 +09:00

parent fd83d3ae94

commit 2779a663d7

17 changed files with 31 additions and 53 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

public/images/common/btn_play/btn_default.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.4 KiB After Width:  |  Height:  |  Size: 582 KiB

BIN

public/images/common/btn_play/btn_default_m.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 7.4 KiB

BIN

public/images/common/btn_play/btn_hover.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 23 KiB After Width:  |  Height:  |  Size: 182 KiB

BIN

public/images/common/btn_play/btn_hover_m.png

Binary file not shown.

Side by Side Before Width:  |  Height:  |  Size: 23 KiB