smtp3 4合并保留一个解决冲突

This commit is contained in:
dongxiaoyan
2020-04-03 13:15:28 +08:00
parent 870b8ef314
commit b18de1728e
2 changed files with 428 additions and 0 deletions

View File

@@ -0,0 +1,11 @@
#!/usr/bin/env python
# -*- coding: utf-8 -*-
# This file is part of robotframework-Smtp3Library.
# https://github.io/lucamaro/robotframework-SmtpLibrary
# Licensed under the Apache License 2.0 license:
# http://www.opensource.org/licenses/Apache-2.0
# Copyright (c) 2016, Luca Maragnani <luca.maragnani@gmail.com>
__version__ = '0.1.3' # NOQA