From d4a911e37e7302ad4414bf3824f0b73712705539 Mon Sep 17 00:00:00 2001
From: Ian Hinder <ian.hinder@aei.mpg.de>
Date: Sun, 22 Jan 2012 18:20:56 +0100
Subject: Thorn.m: Fix merge error

---
 Tools/CodeGen/Thorn.m | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Tools')

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[];
 
-- 
cgit v1.2.3