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