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

Feature/#153 shop screen #158

Merged
merged 75 commits into from
Jan 30, 2024
Merged

Feature/#153 shop screen #158

merged 75 commits into from
Jan 30, 2024

Conversation

ThirFir
Copy link
Contributor

@ThirFir ThirFir commented Jan 30, 2024

PR 개요

이슈 번호:
#153

PR Checklist

  • Code convention을 잘 지켰나요?
  • 테스트 코드를 추가했나요?

작업사항

  • Bugfix
  • Feature
  • Code style update (formatting, local variables)
  • Refactoring (no functional changes, no api changes)
  • Other

작업사항의 상세한 설명

추가내용

  • Added Reviewers, Assignees, Labels, Milestone

skdud0629 and others added 29 commits January 29, 2024 09:34
…ure/#147-follower

# Conflicts:
#	app/src/main/java/com/jjbaksa/jjbaksa/ui/follower/FollowerFragment.kt
#	app/src/main/java/com/jjbaksa/jjbaksa/ui/follower/adapter/FollowerAdapter.kt
#	data/src/main/java/com/jjbaksa/data/api/AuthApi.kt
#	data/src/main/java/com/jjbaksa/data/datasource/FollowerDataSource.kt
#	data/src/main/java/com/jjbaksa/data/datasource/remote/FollowerRemoteDataSource.kt
#	domain/src/main/java/com/jjbaksa/domain/repository/FollowerRepository.kt
…ure/#147-follower

# Conflicts:
#	app/src/main/res/layout/item_follow.xml
# Conflicts:
#	app/src/main/java/com/jjbaksa/jjbaksa/di/DataSourceModule.kt
#	app/src/main/java/com/jjbaksa/jjbaksa/di/RepositoryModule.kt
#	app/src/main/res/values/strings.xml
…ure/#153-shop-screen

# Conflicts:
#	app/src/main/res/values/strings.xml
@wnehdals wnehdals merged commit e51e5c9 into develop Jan 30, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants