smiuser/hpos-registration-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'preprod' into Feature_-_Develop_the_feature_to_shift_between_multiple_languages_in_Registration_app

Browse Source 
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/example/hposregistration/ui/activities/MainActivity.kt
#	app/src/main/res/layout/fragment_user_list.xml
This commit is contained in:
Mariya
2023-12-15 11:37:13 +05:30
parent 73597b9cf4 425bc61a50
commit 4b74277bd3
12 changed files with 151 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/shelf/Changes3.xml generated Normal file
View File

@@ -0,0 +1,4 @@
<changelist name="Changes3" date="1701681803133" recycled="false">
<option name="PATH" value="$PROJECT_DIR$/.idea/shelf/Changes3/shelved.patch" />
<option name="DESCRIPTION" value="Changes" />
</changelist>