Merge branch 'fix/issue-4487' of https://github.com/toprakmurat/fmt into fix/issue-4487

Author: toprakmurat

test/mock-allocator.h

@@ -37,7 +37,11 @@ template <typename T> class mock_allocator {
   MOCK_METHOD(void, deallocate, (T*, size_t));
 };
 
+<<<<<<< HEAD
 template <typename Allocator, bool PropagateOnMove = false>
+=======
+template <typename Allocator, bool PropagateOnMove = false> 
+>>>>>>> 4746ddcefb09bf3c4e44584715f4e7e8f5d5d2a6
 class allocator_ref {
  private:
   Allocator* alloc_;
@@ -52,7 +56,6 @@ class allocator_ref {
   using propagate_on_container_move_assignment =
       typename std::conditional<PropagateOnMove, std::true_type,
                                 std::false_type>::type;
-
   explicit allocator_ref(Allocator* alloc = nullptr) : alloc_(alloc) {}
 
   allocator_ref(const allocator_ref& other) : alloc_(other.alloc_) {}