From 275d4be25543e36c082ed303be78d27359fb0907 Mon Sep 17 00:00:00 2001
From: Valient Gough <vgough@pobox.com>
Date: Thu, 29 Dec 2011 22:27:17 +0000
Subject: [PATCH] fix changelog merge fail

git-svn-id: http://encfs.googlecode.com/svn/trunk@75 db9cf616-1c43-0410-9cb8-a902689de0d6
---
 ChangeLog | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2f22706..963bcf6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,3 @@
-Mon Jun 13 2011 Valient Gough <vgough@pobox.com>
-	* fix for non-b64 conversions, issue 102 patch by gebart.
-
 Wed Dec 28 2011 Valient Gough <vgough@pobox.com>
 	* remove m4-local
 	* bump version to 1.7.5