diff options
author | prashantsinalkar | 2019-09-13 15:01:11 +0530 |
---|---|---|
committer | prashantsinalkar | 2019-09-13 16:21:15 +0530 |
commit | e87d9feb957b25afefc4eee982e76b4a7a045177 (patch) | |
tree | 333196a4220402596d50ab110cd68c7308209fd1 /static/website/templates/email.html | |
parent | 760c6ef028bd4866a81a9e8f00d6c73f828a276c (diff) | |
download | R_on_Cloud_Web_Interface-e87d9feb957b25afefc4eee982e76b4a7a045177.tar.gz R_on_Cloud_Web_Interface-e87d9feb957b25afefc4eee982e76b4a7a045177.tar.bz2 R_on_Cloud_Web_Interface-e87d9feb957b25afefc4eee982e76b4a7a045177.zip |
fixed conflict
Diffstat (limited to 'static/website/templates/email.html')
l--------- | static/website/templates/email.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/static/website/templates/email.html b/static/website/templates/email.html deleted file mode 120000 index 6f2ca7c..0000000 --- a/static/website/templates/email.html +++ /dev/null @@ -1 +0,0 @@ -/home/prashant/www/html/python/python_3.x/django_2.x/fossee/R/R_on_Cloud_Web_Interface/website/static/website/templates/email.html
\ No newline at end of file |