aboutsummaryrefslogtreecommitdiff
path: root/app/dock_docker.py
diff options
context:
space:
mode:
Diffstat (limited to 'app/dock_docker.py')
-rw-r--r--app/dock_docker.py5
1 files changed, 0 insertions, 5 deletions
diff --git a/app/dock_docker.py b/app/dock_docker.py
index eb879c9..8a9a4fb 100644
--- a/app/dock_docker.py
+++ b/app/dock_docker.py
@@ -35,12 +35,7 @@ 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()
s.sendmail(fromaddr, toaddr, text)