From a6f405b47594f6e2cdcdf14c92c83b845a6017cb Mon Sep 17 00:00:00 2001
From: "David G. Holm" <dholm@jsd-llc.com>
Date: Sat, 29 Jul 2000 07:22:32 +0000
Subject: [PATCH] See ChangeLog entry 2000-07-28 15:30 UTC-0400 David G. Holm
 <dholm@jsd-llc.com>

---
 harbour/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index ca8bade447..2e476d9eeb 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -97,7 +97,6 @@
    + tests/testdecl.prg
      + Added test program to utilize the DECLARE in its different contexts.
 
->>>>>>> 1.2467
 2000-07-28 15:00 UTC-0400 David G. Holm <dholm@jsd-llc.com>
 
    * include/hbapigt.h