fix merge marker

Kondamon · Feb 27, 2023 · 3b82864 · 3b82864
1 parent c669dca
commit 3b82864
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/Sources/ComposableArchitecture/Reducer/Reducers/IfLetReducer.swift b/Sources/ComposableArchitecture/Reducer/Reducers/IfLetReducer.swift
@@ -142,7 +142,6 @@ public struct _IfLetReducer<Parent: Reducer, Child: Reducer>: Reducer {
       parentEffects,
       childCancelEffects
     )
->>>>>>> navigation-beta
   }
 
   @inlinable