aboutsummaryrefslogtreecommitdiffhomepage
path: root/changelog.md
diff options
context:
space:
mode:
Diffstat (limited to 'changelog.md')
-rw-r--r--changelog.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/changelog.md b/changelog.md
index ae5b726..c481922 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
# Changelog for [`unix` package](http://hackage.haskell.org/package/unix)
## 2.7.0.2 *TBA*
@@ -9,6 +10,7 @@
CPP macros for required getgrgid_r and getgrnam_r functions definition
so the fix is to change from C ABI calling convention to C API calling
convention
+ * Fix potential type-mismatch in `telldir`/`seekdir` FFI imports
## 2.7.0.1 *Mar 2014*