aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Poznyakoff <gray@gnu.org.ua>2015-12-05 06:57:37 +0000
committerSergey Poznyakoff <gray@gnu.org.ua>2015-12-05 06:57:37 +0000
commit230db2d8db54f9bd7f28169f4ce6b763304f2647 (patch)
tree55fef992cfce6d7eccf3effdf0d43e6cca47a82f
parenta831337e2ae4cdd3b551071a4523b8153cc06171 (diff)
downloadgdbm-230db2d8db54f9bd7f28169f4ce6b763304f2647.tar.gz
gdbm-230db2d8db54f9bd7f28169f4ce6b763304f2647.tar.bz2
Remove strayed conflict indicator
-rw-r--r--ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 30c520c..0b4c5f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -44,7 +44,6 @@
* NEWS: Document COMPATINCLUDEDIR.
* README: Likewise.
->>>>>>> 1.102
2014-02-12 Sergey Poznyakoff <gray@gnu.org.ua>
* src/gdbmimp.c (gdbm_import_from_file): Read record sizes as

Return to:

Send suggestions and report system problems to the System administrator.