]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #39198 from tchaikov/wip-mypy.ini
authorSebastian Wagner <sebastian.wagner@suse.com>
Mon, 1 Feb 2021 08:48:04 +0000 (09:48 +0100)
committerGitHub <noreply@github.com>
Mon, 1 Feb 2021 08:48:04 +0000 (09:48 +0100)
mypy.ini: fix the unresolve conflict

Reviewed-by: Sebastian Wagner <sebastian.wagner@suse.com>

Trivial merge