Remove conflict marker.

5 years ago · 751fda44bd
parent e69dedfc27
commit 751fda44bd
1 changed files with 0 additions and 1 deletions
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@ -204,7 +204,6 @@ Clients:
 Build:
 - Various fixes for building with <C99 support. Closes #1622.
 - Fix use of sed on BSD. Closes #1614.
->>>>>>> fixes


 1.6.9 - 20200227