Ron Pinkas removed conflict symbol >>> from ChangeLog

1999-06-18 12:56:35 +00:00
parent 7b47c59b9c
commit c50df01786
1 changed files with 0 additions and 1 deletions
--- 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