From d544b997fac843afa319f922d17ddcd922993b1f Mon Sep 17 00:00:00 2001
From: prashantsinalkar
Date: Mon, 20 Feb 2017 15:35:05 +0530
Subject: fixed git conflicts

---
 email.inc | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/email.inc b/email.inc
index b2d2920..ae75a61 100755
--- a/email.inc
+++ b/email.inc
@@ -356,11 +356,8 @@ List of user defined compounds used in process flowsheet : ' . $user_defined_com
 Uploaded user defined compound  : ' . $file_name . '
 
 
-<<<<<<< HEAD
+
 You can propose a new flowsheet project.
-=======
-You can propose a new flowsheet project proposal.
->>>>>>> 851a062e17086ecdfb322645e5adf8d55cf3c73e
 
 Best Wishes,
 
-- 
cgit