Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#11] HotelScreen 구현 #12

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[#11] HotelScreen 구현 #12

wants to merge 6 commits into from

Commits on Oct 1, 2024

  1. Configuration menu
    Copy the full SHA
    0d4c7e4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    934530d View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    59aab7c View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    53a1566 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Merge branch 'feature/hotelscreen-15' into feature/11

    # Conflicts:
    #	app/src/main/java/kr/ksw/visitkorea/domain/usecase/home/GetCultureCenterForHomeUseCase.kt
    #	app/src/main/java/kr/ksw/visitkorea/domain/usecase/home/GetCultureCenterForHomeUseCaseImpl.kt
    #	app/src/main/java/kr/ksw/visitkorea/domain/usecase/home/GetLeisureSportsForHomeUseCase.kt
    #	app/src/main/java/kr/ksw/visitkorea/domain/usecase/home/GetLeisureSportsForHomeUseCaseImpl.kt
    #	app/src/main/java/kr/ksw/visitkorea/domain/usecase/model/CommonCardModel.kt
    #	app/src/main/java/kr/ksw/visitkorea/domain/usecase/model/CultureCenter.kt
    #	app/src/main/java/kr/ksw/visitkorea/presentation/home/viewmodel/HomeState.kt
    ksw4015 committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    d1869b1 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    76a82a4 View commit details
    Browse the repository at this point in the history