From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Mon, 1 Feb 2021 08:48:04 +0000 (+0100)
Subject: Merge pull request #39198 from tchaikov/wip-mypy.ini
X-Git-Tag: v17.1.0~3104
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=639fac3564737a1a1d8322e29e5c034f73df790b;p=ceph.git

Merge pull request #39198 from tchaikov/wip-mypy.ini

mypy.ini: fix the unresolve conflict

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

639fac3564737a1a1d8322e29e5c034f73df790b