From 0c926d26cd3852d5ca53c6a8726915dee80fff15 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 1 Feb 2021 14:53:03 +0800 Subject: [PATCH] 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 --- src/mypy.ini | 1 - 1 file changed, 1 deletion(-) 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 -- 2.39.5