Skip to content

feature/owner-arrow-integration#354

Open
M7mdSh3banX wants to merge 16 commits into
developfrom
feature/owner-arrow-integration
Open

feature/owner-arrow-integration#354
M7mdSh3banX wants to merge 16 commits into
developfrom
feature/owner-arrow-integration

Conversation

@M7mdSh3banX

Copy link
Copy Markdown
Collaborator

No description provided.

# Conflicts:
#	owner/src/main/java/org/the_chance/honeymart/ui/features/category/CategoriesViewModel.kt
# Conflicts:
#	owner/build.gradle.kts
#	owner/src/main/java/org/the_chance/honeymart/ui/features/category/CategoriesUiState.kt
#	owner/src/main/java/org/the_chance/honeymart/ui/features/category/CategoriesViewModel.kt
# Conflicts:
#	buildSrc/src/main/java/Dependencies.kt
#	buildSrc/src/main/java/DependencyVersions.kt
#	owner/src/main/java/org/the_chance/honeymart/ui/features/authentication/signup/SignUpViewModel.kt
#	owner/src/main/java/org/the_chance/honeymart/ui/features/category/CategoriesUiState.kt
#	owner/src/main/java/org/the_chance/honeymart/ui/features/category/CategoriesViewModel.kt
#	owner/src/main/java/org/the_chance/honeymart/ui/features/coupons/CouponsUiState.kt
#	owner/src/main/java/org/the_chance/honeymart/ui/features/coupons/CouponsViewModel.kt
@M7mdSh3banX M7mdSh3banX self-assigned this Sep 16, 2023
@M7mdSh3banX M7mdSh3banX added the feature New feature label Sep 16, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

feature New feature

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant