Commit af258e0d authored by Bodo Möller's avatar Bodo Möller
Browse files

remove conflict indicator ...

parent 1ec7ac3c

CHANGES

+0 −1
Original line number Diff line number Diff line
@@ -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]