Kill spurious line from changelog
authorHerbert Valerio Riedel <hvr@gnu.org>
Sat, 6 Dec 2014 12:50:30 +0000 (13:50 +0100)
committerHerbert Valerio Riedel <hvr@gnu.org>
Sat, 6 Dec 2014 12:50:30 +0000 (13:50 +0100)
[skip ci]

changelog.md

index 66caaeb..6ef8de8 100644 (file)
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Changelog for [`unix` package](http://hackage.haskell.org/package/unix)
 
 ## 2.7.0.2  *TBA*