From bcd7650437232467dbfc2d95f2a6dce5f1379025 Mon Sep 17 00:00:00 2001
From: Maurilio Longo <maurilio.longo@libero.it>
Date: Mon, 1 May 2000 21:23:13 +0000
Subject: [PATCH] 20000501-23:21 GMT+2 Maurilio Longo
 <maurilio.longo@libero.it>

---
 harbour/ChangeLog | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index 1bcd4c3084..988d04ce90 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -1,3 +1,9 @@
+20000501-23:21 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
+
+   * ChangeLog
+     ! cvs server: warning: file `harbour/ChangeLog' seems to still contain conflict indicators
+       Removed conflict indicators.
+
 20000501-23:19 GMT+2 Maurilio Longo <maurilio.longo@libero.it>
 
    * source/rtl/teditor.prg
@@ -117,15 +123,9 @@
       * some common parts moved into separate functions
 
     *include/hbcomp.h
-<<<<<<< ChangeLog
-   * changed 'BYTE iJumps' into 'ULONG iJumps' to stop reallocation
-   error mentioned by Victor
+      * changed 'BYTE iJumps' into 'ULONG iJumps' to stop reallocation
+        error mentioned by Victor
 
-=======
-   * changed 'BYTE iJumps' into 'ULONG iJumps' to stop reallocation
-   error mentioned by Victor
-
->>>>>>> 1.2098
 20000501-15:37 GMT+1 Victor Szakats <info@szelvesz.hu>
 
    * source/rtl/teditor.prg