[libc++][NFC] Remove rebase artifact

[fsb4000]

Summary

I found it in this commit: https://github.com/llvm/llvm-project/commit/a203acb9dd7227323d6161431225189d49917744

[Mordante]

LGTM, thanks!

Nice commit to test your commit access!

[fsb4000]

Thank you!
I hope I did it right: https://github.com/llvm/llvm-project/commit/1915c1c01e6c84a1fda5a313f85e2a3dbccd7ce0

[Mordante]

In D131163#3699831, @fsb4000 wrote:

Thank you!
I hope I did it right: https://github.com/llvm/llvm-project/commit/1915c1c01e6c84a1fda5a313f85e2a3dbccd7ce0

LGTM, thanks for asking!

[var-const]

@fsb4000 Thank you for spotting and fixing this!

[fsb4000]

You're welcome!

libcxx/include/algorithm

template<input_range R1, input_range R2, class Pred = ranges::equal_to,
   template<input_range R, weakly_incrementable O, class Proj = identity,
            indirect_equivalence_relation<projected<iterator_t<R>, Proj>> C = ranges::equal_to>
     requires indirectly_copyable<iterator_t<R>, O> &&
              (forward_iterator<iterator_t<R>> ||
               (input_iterator<O> && same_as<range_value_t<R>, iter_value_t<O>>) ||
               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
 
   template<input_iterator I, sentinel_for<I> S, weakly_incrementable O, class T,
            class Proj = identity>
              indirect_binary_predicate<ranges::equal_to, projected<I, Proj>, const T*>
     constexpr remove_copy_result<I, O>