From b279df7f850085ec68c5c03452267623e0925b14 Mon Sep 17 00:00:00 2001
From: Jakob Rath <git@jakobrath.eu>
Date: Mon, 18 Dec 2023 11:38:16 +0100
Subject: [PATCH] fix merge failure

---
 src/util/dlist.h | 10 ----------
 src/util/tbv.h   |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/util/dlist.h b/src/util/dlist.h
index d7206efd8..4c0e51e58 100644
--- a/src/util/dlist.h
+++ b/src/util/dlist.h
@@ -232,7 +232,6 @@ public:
     dll_iterator<T> end() const { return dll_iterator<T>::mk_end(m_list); }
 };
 
-
 template < typename T
          , typename U = std::enable_if_t<std::is_base_of_v<dll_base<T>, T>>  // should only match if T actually inherits from dll_base<T>
          >
@@ -247,12 +246,3 @@ dll_iterator<T> end(T const& list)
 {
     return dll_iterator<T>::mk_end(&list);
 }
-
-template <typename T>
-class dll_elements {
-    T const* m_list;
-public:
-    dll_elements(T const* list): m_list(list) {}
-    dll_iterator<T> begin() const { return dll_iterator<T>::mk_begin(m_list); }
-    dll_iterator<T> end() const { return dll_iterator<T>::mk_end(m_list); }
-};
diff --git a/src/util/tbv.h b/src/util/tbv.h
index c6fc0f32f..3bda89b3f 100644
--- a/src/util/tbv.h
+++ b/src/util/tbv.h
@@ -128,7 +128,7 @@ private:
         return (fixed_bit_vector::get(index) << 1) | (unsigned)fixed_bit_vector::get(index+1);
     }
 };
-    
+
 class tbv_ref {
     tbv_manager& mgr;
     tbv* d;