[llvm-branch-commits] [libcxx] 1711b90 - [libc++][NFC] Remove rebase artifact

[Tom Stellard via llvm-branch-commits]

Author: Igor Zhukov
Date: 2022-08-08T13:29:17-07:00
New Revision: 1711b90981ff1be8fe5c04f0b9caaeb8a23f3235

URL: https://github.com/llvm/llvm-project/commit/1711b90981ff1be8fe5c04f0b9caaeb8a23f3235
DIFF: https://github.com/llvm/llvm-project/commit/1711b90981ff1be8fe5c04f0b9caaeb8a23f3235.diff

LOG: [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)

Added: 
    

Modified: 
    libcxx/include/algorithm

Removed: 
    


################################################################################
diff  --git a/libcxx/include/algorithm b/libcxx/include/algorithm
index 227a40889572..bf8a9846440c 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