fix merge conflict

This commit is contained in:
Rupika 2019-03-08 22:24:24 -08:00
commit 2293c63952

View file

@ -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