fix: resolve mistake in conflict resolution(#60737)#1867

ivis-miyachi merged 1 commit into

develop_v2.1.0RCOSDP/weko:develop_v2.1.0from

fix/issue46649RCOSDP/weko:fix/issue46649Copy head branch name to clipboard