diff --git a/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/SSOAction.kt~develop b/matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/SSOAction.kt similarity index 100% rename from matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/SSOAction.kt~develop rename to matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/SSOAction.kt