aboutsummaryrefslogtreecommitdiffhomepage
path: root/changelog.md
diff options
context:
space:
mode:
authorGravatar Herbert Valerio Riedel <hvr@gnu.org>2014-12-06 13:50:30 +0100
committerGravatar Herbert Valerio Riedel <hvr@gnu.org>2014-12-06 13:50:30 +0100
commit054df8427dc6480bad1f782371a6b7c3ee199574 (patch)
treed200f6b6efd1e01ecae4627e725e553ba1b995f6 /changelog.md
parent5dd47a6de1e5b71b488ec86942bf9920ad1e6b19 (diff)
Kill spurious line from changelog
[skip ci]
Diffstat (limited to 'changelog.md')
-rw-r--r--changelog.md1
1 files changed, 0 insertions, 1 deletions
diff --git a/changelog.md b/changelog.md
index 66caaeb..6ef8de8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
# Changelog for [`unix` package](http://hackage.haskell.org/package/unix)
## 2.7.0.2 *TBA*