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 61b930737d01b84d59ba175e6313665263a71877..a10f9e4b3f26d1ec8bbe6d644911ddb8147763e8 100755 (executable)
--- 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