Quanah Gibson-Mount pushed to branch master at openldap / OpenLDAP

Commits:

• 9900794a
  by Howard Chu at 2020-08-26T21:00:00+01:00

  ITS#9329 Re-fix merge_state
  
  A bit uglier but more straightforward.
  

1 changed file:

• servers/slapd/syncrepl.c