fix merge conflict
This commit is contained in:
commit
2293c63952
1 changed files with 4 additions and 4 deletions
|
@ -1,4 +1,4 @@
|
|||
EMAIL_HOST_USER=account@gmail.com
|
||||
EMAIL_HOST_PASSWORD=password
|
||||
SUBMIT_REPORT_DESTINATION_EMAIL=your-email@pdx.edu
|
||||
SUBMIT_REPORT_FROM_EMAIL=account@gmail.com
|
||||
EMAIL_HOST_USER=gmail_account@gmail.com
|
||||
EMAIL_HOST_PASSWORD=gmail_password
|
||||
SUBMIT_REPORT_DESTINATION_EMAIL=to_address@gmail.com
|
||||
SUBMIT_REPORT_FROM_EMAIL=from_address@gmail.com
|
||||
|
|
Loading…
Reference in a new issue