From 780e6df8adcd5a185d58104f4775dc45a5c3080e Mon Sep 17 00:00:00 2001 From: Bruce Korb Date: Tue, 14 Dec 2010 12:43:25 -0800 Subject: [PATCH] remove merge dinkleberries --- ChangeLog | 2 -- libposix/.gitignore | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 936fbf6d80..d6d18c6b29 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= 2010-12-13 Pádraig Brady read-file: Improve handling of large files diff --git a/libposix/.gitignore b/libposix/.gitignore index 871206de71..762876648f 100644 --- a/libposix/.gitignore +++ b/libposix/.gitignore @@ -46,3 +46,4 @@ warn-on-use.h _b* _i* /libposix*.tar.* +/libposix-* -- 2.39.5