| commit | 914e8c40013110c49a088d5bcf6a68382bf31cc5 | [log] [tgz] |
|---|---|---|
| author | Igor Zhukov <fsb4000@yandex.ru> | Thu Aug 04 22:50:51 2022 +0700 |
| committer | Copybara-Service <copybara-worker@google.com> | Thu Aug 04 09:01:09 2022 -0700 |
| tree | 29c68a353658ccf741919f5341f88760b92a2e9a | |
| parent | d87c9906caca64b5d12c89ea1bd367d7e35c10c9 [diff] |
[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 GitOrigin-RevId: 1915c1c01e6c84a1fda5a313f85e2a3dbccd7ce0
diff --git a/include/algorithm b/include/algorithm index 227a408..bf8a984 100644 --- a/include/algorithm +++ b/include/algorithm
@@ -936,7 +936,6 @@ 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