remove conflict indicator ...

af258e0d · Bodo Möller · 1ec7ac3c · af258e0d
隐藏空白更改
内联并排

Showing with 0 addition and 1 deletion

CHANGES CHANGES +0 -1

未找到文件。
--- a/CHANGES
+++ b/CHANGES
@@ -18,7 +18,6 @@
  *) Support BS2000/OSD-POSIX.
     [Martin Kraemer <Martin.Kraemer@MchP.Siemens.De>]

->>>>>>> 1.252
  *) Make callbacks for key generation use void * instead of char *.
     [Ben Laurie]