From: Kefu Chai <kchai@redhat.com>
Date: Mon, 1 Feb 2021 06:53:03 +0000 (+0800)
Subject: mypy.ini: fix the unresolved conflict
X-Git-Tag: v17.1.0~3104^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=0c926d26cd3852d5ca53c6a8726915dee80fff15;p=ceph-ci.git

mypy.ini: fix the unresolved conflict

it was introduced by a0930a63106e9f0d556e18bd70ffca6566388742, i failed
to resolve this conflict when resolving the merge confliction.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/mypy.ini b/src/mypy.ini
index 61b930737d0..a10f9e4b3f2 100755
--- a/src/mypy.ini
+++ b/src/mypy.ini
@@ -33,7 +33,6 @@ disallow_untyped_defs = True
 [mypy-iostat.*]
 disallow_untyped_defs = True
 
->>>>>>> 514d3b6785... mgr/rook: disallow_untyped_defs = True
 [mypy-orchestrator.*]
 disallow_untyped_defs = True