From c6e3bbc7869f6b95cdd9489c6bcbc0ac5881c3b2 Mon Sep 17 00:00:00 2001 From: Eddy Date: Fri, 9 Sep 2022 22:12:39 +0200 Subject: [PATCH] resolve conflict --- .../src/main/kotlin/com/lagradost/VostfreeProvider.kt | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/VostfreeProvider/src/main/kotlin/com/lagradost/VostfreeProvider.kt b/VostfreeProvider/src/main/kotlin/com/lagradost/VostfreeProvider.kt index b414f28..b4181a3 100644 --- a/VostfreeProvider/src/main/kotlin/com/lagradost/VostfreeProvider.kt +++ b/VostfreeProvider/src/main/kotlin/com/lagradost/VostfreeProvider.kt @@ -9,12 +9,7 @@ import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson import org.jsoup.nodes.Element -import com.fasterxml.jackson.annotation.JsonProperty -import com.lagradost.cloudstream3.* -import com.lagradost.cloudstream3.utils.* -import com.lagradost.cloudstream3.utils.AppUtils.toJson -import com.lagradost.cloudstream3.utils.AppUtils.tryParseJson -import org.jsoup.nodes.Element + class VostfreeProvider : MainAPI() {