diff options
| author | Igor Zhukov <fsb4000@yandex.ru> | 2022-08-04 22:50:51 +0700 |
|---|---|---|
| committer | Tom Stellard <tstellar@redhat.com> | 2022-08-08 13:29:17 -0700 |
| commit | 1711b90981ff1be8fe5c04f0b9caaeb8a23f3235 (patch) | |
| tree | a85af6b96fd862b027529c0d61cded47d28e0187 | |
| parent | f20566daeb0eb7d560e69847b37cb9dc38cd6129 (diff) | |
| download | llvm-1711b90981ff1be8fe5c04f0b9caaeb8a23f3235.zip llvm-1711b90981ff1be8fe5c04f0b9caaeb8a23f3235.tar.gz llvm-1711b90981ff1be8fe5c04f0b9caaeb8a23f3235.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
(cherry picked from commit 1915c1c01e6c84a1fda5a313f85e2a3dbccd7ce0)
| -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 |