Merge remote-tracking branch 'origin/feature/social_login' into featu…

…re/social_login # Conflicts: # app/build.gradle # app/src/main/java/org/openedx/app/di/AppModule.kt # app/src/main/java/org/openedx/app/di/ScreenModule.kt # auth/src/main/java/org/openedx/auth/data/api/AuthApi.kt # auth/src/main/java/org/openedx/auth/data/model/LoginType.kt # auth/src/main/java/org/openedx/auth/data/repository/AuthRepository.kt # auth/src/main/java/org/openedx/auth/presentation/signin/SignInViewModel.kt # auth/src/main/java/org/openedx/auth/presentation/sso/GoogleAuthHelper.kt # auth/src/main/java/org/openedx/auth/presentation/sso/MicrosoftAuthHelper.kt # auth/src/main/res/values/strings.xml # config.yaml # core/.gitignore # core/build.gradle # core/src/main/java/org/openedx/core/ApiConstants.kt
openedx · Dec 4, 2023 · 5729be9 · 5729be9
2 parents d331fa1 + b094567
commit 5729be9
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/auth/src/main/res/values/strings.xml b/auth/src/main/res/values/strings.xml
@@ -20,7 +20,4 @@
     <string name="auth_example_email" translatable="false">[email protected]</string>
     <string name="auth_enter_password">Enter password</string>
     <string name="auth_create_new_account">Create new account.</string>
-    <string name="auth_google">Sign in with Google</string>
-    <string name="auth_facebook">Sign in with Facebook</string>
-    <string name="auth_microsoft">Sign in with Microsoft</string>
 </resources>