fixed ResolveableWhenStateDoesNotChange, changed show_tryToResolveConflict_log_output to check both cases
Attach a file by drag & drop or click to upload
