From da20c52802cbb4c68cfbb058e9ffc986b591240f Mon Sep 17 00:00:00 2001
From: "S. Co1" <sco1.git@gmail.com>
Date: Wed, 11 Sep 2019 11:33:16 -0400
Subject: Fix incorrect merge conflict resolutions, lint remaining items

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index dec88854..ee898b0d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,7 +11,7 @@ ignore=
     # Docstring Quotes
     D301,D302,
     # Docstring Content
-    D400,D401,D402,D405,D406,D407,D408,D409,D410,D411,D412,D413,D414
+    D400,D401,D402,D404,D405,D406,D407,D408,D409,D410,D411,D412,D413,D414,D416,D417
     # Type Annotations
     TYP002,TYP003,TYP101,TYP102,TYP204,TYP206
 exclude=
-- 
cgit v1.2.3