From e87d9feb957b25afefc4eee982e76b4a7a045177 Mon Sep 17 00:00:00 2001
From: prashantsinalkar
Date: Fri, 13 Sep 2019 15:01:11 +0530
Subject: fixed conflict

---
 static/website/templates/email.html | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 static/website/templates/email.html

(limited to 'static/website/templates/email.html')

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