Commit Graph

13 Commits

Author SHA1 Message Date
Mariya
83dbadef00 Revert uncommitted changes 2023-12-15 17:57:50 +05:30
Mariya
c0782b85a0 Committing local changes before revert 2023-12-15 17:57:04 +05:30
Mariya
4e5df74cea merged with preprod branch 2023-12-15 12:20:35 +05:30
Mariya
4b74277bd3 Merge branch 'preprod' into Feature_-_Develop_the_feature_to_shift_between_multiple_languages_in_Registration_app
# Conflicts:
#	app/build.gradle
#	app/src/main/java/com/example/hposregistration/ui/activities/MainActivity.kt
#	app/src/main/res/layout/fragment_user_list.xml
2023-12-15 11:37:13 +05:30
Mariya
425bc61a50 fixing errors related to version 2023-12-14 13:26:54 +05:30
Mariya
8a0c0f326b Merge branch 'Feature_-_Develop_the_feature_to_shift_between_multiple_languages_in_Registration_app' into AppVersion 2023-12-04 14:59:19 +05:30
Mariya
ff972759f5 kannada and hindi version of strings added 2023-12-04 14:54:38 +05:30
Mariya
d24578cc1c kannada and hindi language Translation version added 2023-12-04 12:46:26 +05:30
Mariya
6835068f13 kannada and hindi language Translation version added 2023-12-04 12:43:20 +05:30
Mohamed Kaif
899bda819b Delete shelved.patch 2023-07-04 09:35:24 +00:00
Mohamed Kaif
dec9afe92a Delete Uncommitted_changes_before_Update_at_21-06-2023_11_16__Changes_.xml 2023-07-04 09:35:08 +00:00
smileomi18@gmail.com
21d4aa5624 20/06/2023 -test session bug resolve 2023-07-04 14:58:43 +05:30
smileomi18@gmail.com
9c0694584c 20/06/2023 -test session bug resolve 2023-06-23 10:53:07 +05:30