diff options
| author | prashantsinalkar | 2017-02-20 15:35:05 +0530 |
|---|---|---|
| committer | prashantsinalkar | 2017-02-20 15:35:05 +0530 |
| commit | d544b997fac843afa319f922d17ddcd922993b1f (patch) | |
| tree | f0a28106386b8e6f1e0e3e96ad516eaaab39ce6c | |
| parent | 1a9ac8522769b78d33c87f3d0d6a350cb820ef8d (diff) | |
| download | dwsim_flowsheet-d544b997fac843afa319f922d17ddcd922993b1f.tar.gz dwsim_flowsheet-d544b997fac843afa319f922d17ddcd922993b1f.tar.bz2 dwsim_flowsheet-d544b997fac843afa319f922d17ddcd922993b1f.zip | |
fixed git conflicts
| -rwxr-xr-x | email.inc | 5 |
1 files changed, 1 insertions, 4 deletions
@@ -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, |