From bf2f1b30da79660c0c3653bbdb270a7c8d6b80ac Mon Sep 17 00:00:00 2001
From: Taras Smakula <tarassmakula@gmail.com>
Date: Wed, 15 Mar 2023 15:39:59 +0200
Subject: [PATCH] Fix merge

---
 .../android/sdk/api/auth/{SSOAction.kt~develop => SSOAction.kt}   | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/auth/{SSOAction.kt~develop => SSOAction.kt} (100%)

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
-- 
GitLab