Merge conflicts

novasamatech · Sep 5, 2022 · fb28757 · fb28757
1 parent f5690d6
commit fb28757
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/common/src/main/java/io/novafoundation/nova/common/utils/FlowExt.kt b/common/src/main/java/io/novafoundation/nova/common/utils/FlowExt.kt
@@ -218,7 +218,6 @@ fun <T> flowOf(producer: suspend () -> T) = flow {
     emit(producer())
 }
 
-@OptIn(ExperimentalCoroutinesApi::class)
 fun <T> accumulate(vararg flows: Flow<T>): Flow<List<T>> {
     val flowsList = flows.mapIndexed { index, flow -> flow.map { index to flow } }
     val resultOfFlows = MutableList<T?>(flowsList.size) { null }