Remove strategy from EntryConflictResolver#9567

itaigilo merged 1 commit intomastertreeverse/lakeFS:masterfrom

fix/remove-strategy-from-entry-conflict-resolvertreeverse/lakeFS:fix/remove-strategy-from-entry-conflict-resolverCopy head branch name to clipboard