aboutsummaryrefslogtreecommitdiff
path: root/ML_BSSN/configuration.ccl
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@cct.lsu.edu>2009-04-27 11:15:22 -0500
committerErik Schnetter <schnetter@cct.lsu.edu>2009-04-27 11:15:22 -0500
commit311e827317642ecf806d05ab2ec25bd307ebd65f (patch)
treeb95a3c79beebad5fec8d9489bc38c88f149e5786 /ML_BSSN/configuration.ccl
parent2ca9b048d3710cab763737790679bcc68a3bf122 (diff)
Resolve merge commits
Diffstat (limited to 'ML_BSSN/configuration.ccl')
-rw-r--r--ML_BSSN/configuration.ccl4
1 files changed, 2 insertions, 2 deletions
diff --git a/ML_BSSN/configuration.ccl b/ML_BSSN/configuration.ccl
index 006249a..c4e15c5 100644
--- a/ML_BSSN/configuration.ccl
+++ b/ML_BSSN/configuration.ccl
@@ -1,5 +1,5 @@
-# File produced by user diener
-# Produced with Mathematica Version 6.0 for Linux x86 (32-bit) (April 20, 2007)
+# File produced by user eschnett
+# Produced with Mathematica Version 6.0 for Mac OS X x86 (64-bit) (May 21, 2008)
# Mathematica script written by Ian Hinder and Sascha Husa