From d164510d0a1348e79ad5cbdc86aeacd256188abc Mon Sep 17 00:00:00 2001
From: Janusz Dobrowolski <janusz@frontaccounting.eu>
Date: Wed, 26 Aug 2009 22:12:52 +0000
Subject: [PATCH] *** empty log message ***

---
 CHANGELOG.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5a65f2cb..3a6c25b7 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1104,7 +1104,6 @@ $ /sales/includes/db/sales_order_db.inc
   Balance Sheet, PL Statements and Monthly Bread Down reports.
 $ /gl/manage/gl_account_classes.php.  
 
->>>>>>> 1.265
 ------------------------------- Release 2.1.4 ----------------------------------
 30-Jul-2009 Joe Hunt
 ! Release 2.1.4
-- 
2.30.2