diff options
| author | Igor Zhukov <fsb4000@yandex.ru> | 2022-08-04 22:50:51 +0700 |
|---|---|---|
| committer | Igor Zhukov <fsb4000@yandex.ru> | 2022-08-04 22:53:32 +0700 |
| commit | 1915c1c01e6c84a1fda5a313f85e2a3dbccd7ce0 (patch) | |
| tree | 534e939ccd67691a8c7792566b004c00596cf5c1 /libcxx/include/algorithm | |
| parent | b692312ca432d9a379f67a8d83177a6f1722baaa (diff) | |
| download | llvm-1915c1c01e6c84a1fda5a313f85e2a3dbccd7ce0.zip llvm-1915c1c01e6c84a1fda5a313f85e2a3dbccd7ce0.tar.gz llvm-1915c1c01e6c84a1fda5a313f85e2a3dbccd7ce0.tar.bz2 | |
[libc++][NFC] Remove rebase artifact
I found it in this commit: https://github.com/llvm/llvm-project/commit/a203acb9dd7227323d6161431225189d49917744
Reviewed By: Mordante
Differential Revision: https://reviews.llvm.org/D131163
Diffstat (limited to 'libcxx/include/algorithm')
| -rw-r--r-- | libcxx/include/algorithm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libcxx/include/algorithm b/libcxx/include/algorithm index 227a408..bf8a984 100644 --- a/libcxx/include/algorithm +++ b/libcxx/include/algorithm @@ -936,7 +936,6 @@ namespace ranges { indirectly_copyable_storable<iterator_t<R>, O>) constexpr unique_copy_result<borrowed_iterator_t<R>, O> unique_copy(R&& r, O result, C comp = {}, Proj proj = {}); // Since C++20 -<<<<<<< HEAD template<class I, class O> using remove_copy_result = in_out_result<I, O>; // Since C++20 |