From 59526f695fe5c2a5cc994ad5c9213d78d5a7fa54 Mon Sep 17 00:00:00 2001
From: Thorodinson1 <maniwertyu123@gmail.com>
Date: Tue, 5 Mar 2024 22:52:35 +0530
Subject: [PATCH]  conflicts resolved

---
 .../lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
index 3536f21c..9e6f8a06 100644
--- a/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
+++ b/app/src/main/java/com/lagradost/cloudstream3/ui/settings/testing/TestViewModel.kt
@@ -11,7 +11,6 @@ import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.cancel
 
-
 class TestViewModel : ViewModel() {
     data class TestProgress(
         val passed: Int,