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

Adding Challenge page #19

Merged
merged 9 commits into from
Apr 30, 2024
Merged

Adding Challenge page #19

merged 9 commits into from
Apr 30, 2024

Conversation

BasemKhater
Copy link
Collaborator

Add a new page

@amrhossamdev
Copy link
Collaborator

Good work but please resolve this conflicts

@amrhossamdev amrhossamdev self-requested a review April 30, 2024 11:32
amrhossamdev and others added 5 commits April 30, 2024 15:14
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/modarb/android/ui/home/ui/more/activities/ChallengeActivity.kt
#	app/src/main/java/com/modarb/android/ui/menu/activities/MenuActivity.kt
#	app/src/main/res/values/colors.xml
#	app/src/main/res/values/strings.xml
@amrhossamdev amrhossamdev merged commit 64e7f77 into master Apr 30, 2024
1 check passed
@amrhossamdev amrhossamdev deleted the more_pages branch April 30, 2024 15:23
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.

2 participants