[cig-commits] r7361 - mc/3D/CitcomS/trunk/tests

[hlin at geodynamics.org]

Author: hlin
Date: 2007-06-21 15:35:33 -0700 (Thu, 21 Jun 2007)
New Revision: 7361

Modified:
   mc/3D/CitcomS/trunk/tests/test1.sh
Log:
Resolved the conflict

Modified: mc/3D/CitcomS/trunk/tests/test1.sh
===================================================================
--- mc/3D/CitcomS/trunk/tests/test1.sh	2007-06-21 22:34:07 UTC (rev 7360)
+++ mc/3D/CitcomS/trunk/tests/test1.sh	2007-06-21 22:35:33 UTC (rev 7361)
@@ -26,8 +26,12 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 #
 
+#
+#
 # functional test of exchanger
 # 12-proc coarse-grid exchanger, 1-proc fine-grid exchanger
+#
+#
 
 OUTPUT=zzz
 TEMPFILE=/tmp/$USER/tmptest1