navan
/
Curie-Web
mirror of https://github.com/navanchauhan/Curie-Web.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of github.com:navanchauhan/Curie-Web 

fixed conflict
This commit is contained in:
Navan Chauhan 2020-08-01 15:38:20 +05:30
parent 27372d6942 d68da3f38a
commit e69e058f6b
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/dock_docker.py
View File

@ -35,7 +35,11 @@ def email(zipArchive):
s = smtplib.SMTP('smtp.gmail.com', 587)
s.starttls()
s.login(fromaddr, 'thqw spyz ewqn rahy')
<<<<<<< HEAD
s.login(fromaddr, 'okrs shoc ahtk idui')
=======
s.login(fromaddr, 'okrs shoc ahtk idui')
>>>>>>> d68da3f38ac2b3740a2604dbf15e39fe9e307329
text = msg.as_string()
@ -92,4 +96,4 @@ with tempfile.TemporaryDirectory() as directory:
email(zi)
#print((str(zi) + ".zip"))
mycursor.execute('UPDATE curieweb set done=1 where id="%s"' % (jobID))
mycon.commit()
mycon.commit()

4
tests/backendTest.py
View File

@ -36,7 +36,7 @@ def email(compressedFile):
s = smtplib.SMTP('smtp.gmail.com', 587)
s.starttls()
s.login(fromaddr, 'ircd mday avbc tice')
s.login(fromaddr, 'okrs shoc ahtk idui')
text = msg.as_string()
@ -91,4 +91,4 @@ with tempfile.TemporaryDirectory() as directory:
make_archive(zi, 'zip', directory)
email(zi)
mycursor.execute('UPDATE curieweb set done=1 where id="%s"' % (jobID))
mycon.commit()
mycon.commit()