1 files changed, 4 insertions, 0 deletions

diff --git a/email.inc b/email.inc
index 91a6f4d..b2d2920 100755
--- a/email.inc
+++ b/email.inc
@@ -356,7 +356,11 @@ 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,