Fix rebase errors

aio-libs · Mar 24, 2021 · f146e6b · f146e6b
1 parent 0bf44ac
commit f146e6b
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 12 deletions.
diff --git a/aiosmtpd/docs/NEWS.rst b/aiosmtpd/docs/NEWS.rst
@@ -14,7 +14,6 @@ Fixed/Improved
 --------------
 * All Controllers now have more rationale design, as they are now composited from a Base + a Mixin
 * A whole bunch of annotations
-* A whole bunch of annotations
 
 
 1.4.2 (2021-03-08)
@@ -42,15 +41,6 @@ Fixed/Improved
 * Maximum length of email address local part is customizable, defaults to no limit. (Closes #257)
 
 
-1.4.1 (aiosmtpd-next)
-=====================
-
-Fixed/Improved
---------------
-* Maximum length of email address local part is customizable, defaults to no limit. (Closes #257)
-
-
-
 1.4.0 (2021-02-26)
 ==================
 

diff --git a/aiosmtpd/tests/test_main.py b/aiosmtpd/tests/test_main.py
@@ -22,8 +22,6 @@
 from aiosmtpd.testing.statuscodes import SMTP_STATUS_CODES as S
 from aiosmtpd.tests.conftest import AUTOSTOP_DELAY, SERVER_CRT, SERVER_KEY
 
-from .conftest import AUTOSTOP_DELAY
-
 try:
     import pwd
 except ImportError: