diff options
| -rw-r--r-- | changelog.md | 1 |
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* |