fix merge conflict

2022-12-01 19:33:20 +01:00 · 2022-12-01 19:33:20 +01:00 · 8c08fbddb6
commit 8c08fbddb6
parent 9362e59d9d dbc4a3dcb2
10 changed files with 480 additions and 2 deletions
--- a/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
+++ b/app/src/main/java/com/keylesspalace/tusky/network/MastodonApi.kt
@ -481,6 +481,11 @@ interface MastodonApi {
    @GET("/api/v1/lists")
    suspend fun getLists(): NetworkResult<List<MastoList>>

+    @GET("/api/v1/accounts/{id}/lists")
+    suspend fun getListsIncludesAccount(
+        @Path("id") accountId: String
+    ): NetworkResult<List<MastoList>>
+
    @FormUrlEncoded
    @POST("api/v1/lists")
    suspend fun createList(