fix conflicts

Author: ulysses4ever

Cabal-hooks/CHANGELOG.md

@@ -1,17 +1,9 @@
-# Changelog for `Cabal-hooks`
-
-<<<<<<< HEAD
-## 3.16 – November 2024
-
-  * Release accompanying `Cabal-3.16`.
-    No changes to `Cabal-hooks` itself; all changes come changes in re-exports
-    from `Cabal`.
-=======
-## 3.14.2 - April 2025
-  * No changes
->>>>>>> 7bd6198c0 (Add release notes for 3.14.2.0 release)
-
-## 3.14 – November 2024
-
-  * Initial release of the `Hooks` API.
-
+# Changelog for `Cabal-hooks`
+
+## 3.14.2 – April 2025
+  * No changes
+
+## 3.14 – November 2024
+
+  * Initial release of the `Hooks` API.
+