Fix merge conflicts

1 files changed, 0 insertions, 19 deletions

diff --git a/app/src/androidTest/kotlin/com/pitchedapps/frost/FrostTestApp.kt b/app/src/androidTest/kotlin/com/pitchedapps/frost/FrostTestApp.kt
index 2a834cc8..021e9c1f 100644
--- a/app/src/androidTest/kotlin/com/pitchedapps/frost/FrostTestApp.kt
+++ b/app/src/androidTest/kotlin/com/pitchedapps/frost/FrostTestApp.kt
@@ -19,13 +19,7 @@ package com.pitchedapps.frost
 import android.app.Application
 import android.content.Context
 import androidx.test.runner.AndroidJUnitRunner
-import com.pitchedapps.frost.prefs.Prefs
 import dagger.hilt.android.testing.HiltTestApplication
-import org.junit.rules.TestRule
-import org.junit.runner.Description
-import org.junit.runners.model.Statement
-import org.koin.core.component.KoinComponent
-import org.koin.core.component.get
 
 class FrostTestRunner : AndroidJUnitRunner() {
     override fun newApplication(
@@ -36,16 +30,3 @@ class FrostTestRunner : AndroidJUnitRunner() {
         return super.newApplication(cl, HiltTestApplication::class.java.name, context)
     }
 }
-
-class FrostTestRule : TestRule {
-    override fun apply(base: Statement, description: Description): Statement =
-        object : Statement(), KoinComponent {
-            override fun evaluate() {
-
-                // Reset prefs
-                get<Prefs>().reset()
-
-                base.evaluate()
-            }
-        }
-}