diff options
| author | Navan Chauhan <navanchauhan@gmail.com> | 2020-08-01 15:38:20 +0530 |
|---|---|---|
| committer | Navan Chauhan <navanchauhan@gmail.com> | 2020-08-01 15:38:20 +0530 |
| commit | e69e058f6b9bfce0261fabf2713e6dec9ecd5bfb (patch) | |
| tree | d2af2b85f17aa19270082ec50d906751cfc3fc0e | |
| parent | 27372d69423f8fdd18296e99b6d96ef9d2e668c3 (diff) | |
| parent | d68da3f38ac2b3740a2604dbf15e39fe9e307329 (diff) | |
Merge branch 'master' of github.com:navanchauhan/Curie-Web
fixed conflict
| -rw-r--r-- | app/dock_docker.py | 8 | ||||
| -rw-r--r-- | tests/backendTest.py | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/app/dock_docker.py b/app/dock_docker.py index 1e57cfc..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() - 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()
\ No newline at end of file + mycon.commit() diff --git a/tests/backendTest.py b/tests/backendTest.py index 5b5a453..d172033 100644 --- a/tests/backendTest.py +++ b/tests/backendTest.py @@ -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()
\ No newline at end of file + mycon.commit() |