Eliminate conflicts!

Wulian233 · web-flow · commit 2c31f2590037 · 2025-06-01T21:03:39.000+08:00
diff --git a/Doc/whatsnew/3.15.rst b/Doc/whatsnew/3.15.rst
@@ -97,7 +97,6 @@ calendar
   (Contributed by Jiahao Li in :gh:`135001`.)
 
 
-=======
 dbm
 ---
 

-Original file line number
+Diff line change
   (Contributed by Jiahao Li in :gh:`135001`.)
 -=======
 dbm
 ---