diff options
| author | Ian Hinder <ian.hinder@aei.mpg.de> | 2012-01-22 18:20:56 +0100 |
|---|---|---|
| committer | Ian Hinder <ian.hinder@aei.mpg.de> | 2012-01-22 18:20:56 +0100 |
| commit | d4a911e37e7302ad4414bf3824f0b73712705539 (patch) | |
| tree | 8209b176e09889e27b63db8912610c0e603897fa /Tools | |
| parent | 3d97e7742f336ee9ae41520451ec41a69ce9a734 (diff) | |
Thorn.m: Fix merge error
Diffstat (limited to 'Tools')
| -rw-r--r-- | Tools/CodeGen/Thorn.m | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Tools/CodeGen/Thorn.m b/Tools/CodeGen/Thorn.m index 428d764..429f21b 100644 --- a/Tools/CodeGen/Thorn.m +++ b/Tools/CodeGen/Thorn.m @@ -1409,9 +1409,8 @@ CreateThorn[thorn_] := GenerateFile[thornDirectory <> "/temp", {}]; DeleteFile[thornDirectory <> "/temp"]; - Print["Thorn ", thornDirectory, " created successfully"]]; + Print["Thorn ", thornDirectory, " created successfully"]; ]; ->>>>>>> hydro End[]; |