# HG changeset patch
# User Bruce Korb <bkorb@gnu.org>
# Date 1292359405 28800
# Node ID 2256b67fa8bc8304a5a43f533ae04878346f1a34
# Parent  ef8b363d4b548a675a9fc5f53758766514f952a6
remove merge dinkleberries

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,3 @@
-<<<<<<< HEAD
-=======
 2010-12-13  Pádraig Brady <P@draigBrady.com>
 
 	read-file: Improve handling of large files
diff --git a/libposix/.gitignore b/libposix/.gitignore
--- a/libposix/.gitignore
+++ b/libposix/.gitignore
@@ -46,3 +46,4 @@
 _b*
 _i*
 /libposix*.tar.*
+/libposix-*