From c50df017867f1cb6a00d612e38298e43dbda34a3 Mon Sep 17 00:00:00 2001
From: Ron Pinkas <ron@profit-master.com>
Date: Fri, 18 Jun 1999 12:56:35 +0000
Subject: [PATCH] Ron Pinkas removed conflict symbol >>> from ChangeLog

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

diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index b90e346c79..535c6e5025 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -20,7 +20,6 @@
  * source\hbpp\table.c
   Fixed some problems with preprocessor
 
->>>>>>> 1.316
 19990618-07:50 Ryszard Glab <rglab@imid.med.pl>
 
 * source/compiler/harbour.y