Skip to content

Commit 1711b90

Browse files
fsb4000tstellar
authored andcommitted
[libc++][NFC] Remove rebase artifact
I found it in this commit: a203acb Reviewed By: Mordante Differential Revision: https://reviews.llvm.org/D131163 (cherry picked from commit 1915c1c)
1 parent f20566d commit 1711b90

File tree

1 file changed

+0
-1
lines changed

1 file changed

+0
-1
lines changed

libcxx/include/algorithm

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -936,7 +936,6 @@ namespace ranges {
936936
indirectly_copyable_storable<iterator_t<R>, O>)
937937
constexpr unique_copy_result<borrowed_iterator_t<R>, O>
938938
unique_copy(R&& r, O result, C comp = {}, Proj proj = {}); // Since C++20
939-
<<<<<<< HEAD
940939
941940
template<class I, class O>
942941
using remove_copy_result = in_out_result<I, O>; // Since C++20

0 commit comments

Comments
 (0)