...

cowtowncoder · cowtowncoder · commit 390fa4b5fb82 · 2024-10-19T19:24:27.000-07:00
diff --git a/release-notes/VERSION-2.x b/release-notes/VERSION-2.x
@@ -104,8 +104,6 @@ Active maintainers:
   are no longer leaked
  (contributed by @tgregg)
 
-=======
->>>>>>> 2.16
 2.16.2 (09-Mar-2024)
 
 No changes since 2.16.1
