Skip to content

Commit ca41b0a

Browse files
jensmaurerJohelEGP
andauthored
Apply suggestions from code review
Co-authored-by: Johel Ernesto Guerrero Peña <[email protected]>
1 parent 8ea647d commit ca41b0a

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

source/algorithms.tex

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,15 +1226,9 @@
12261226
@\exposconcept{indirectly-binary-right-foldable}@<T, iterator_t<R>> F>
12271227
constexpr auto fold_right(R&& r, T init, F f);
12281228

1229-
<<<<<<< Updated upstream
12301229
template <@\libconcept{bidirectional_iterator}@ I, @\libconcept{sentinel_for}@<I> S,
12311230
@\exposconcept{indirectly-binary-right-foldable}@<iter_value_t<I>, I> F>
12321231
requires @\libconcept{constructible_from}@<iter_value_t<I>, iter_reference_t<I>>
1233-
=======
1234-
template<@\libconcept{bidirectional_iterator}@ I, @\libconcept{sentinel_for}@<I> S,
1235-
indirectly-binary-right-foldable<iter_value_t<I>, I> F>
1236-
requires constructible_from<iter_value_t<I>, iter_reference_t<I>>
1237-
>>>>>>> Stashed changes
12381232
constexpr auto fold_right_last(I first, S last, F f);
12391233

12401234
template<@\libconcept{bidirectional_range}@ R,

0 commit comments

Comments
 (0)