1 files changed, 0 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 9b5fc0d89e..403ec97d5d 100644
--- a/CHANGES
+++ b/CHANGES
@@ -27,7 +27,6 @@
   *) Fix problems with sizeof(long) == 8.
      [Andy Polyakov <appro@fy.chalmers.se>]
 
->>>>>>> 1.185
   *) Change functions to ANSI C.
      [Ulf Möller]