diff options
Diffstat (limited to 'app/dock_docker.py')
| -rw-r--r-- | app/dock_docker.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/dock_docker.py b/app/dock_docker.py index bb5ad61..eb879c9 100644 --- a/app/dock_docker.py +++ b/app/dock_docker.py @@ -35,7 +35,11 @@ def email(zipArchive): s = smtplib.SMTP('smtp.gmail.com', 587) s.starttls() +<<<<<<< HEAD s.login(fromaddr, 'okrs shoc ahtk idui') +======= + s.login(fromaddr, 'okrs shoc ahtk idui') +>>>>>>> d68da3f38ac2b3740a2604dbf15e39fe9e307329 text = msg.as_string() |