.

author Wolfgang Bangerth <bangerth@math.tamu.edu>

Mon, 22 Jan 2001 08:23:04 +0000 (08:23 +0000)

committer Wolfgang Bangerth <bangerth@math.tamu.edu>

Mon, 22 Jan 2001 08:23:04 +0000 (08:23 +0000)
author Wolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 22 Jan 2001 08:23:04 +0000 (08:23 +0000)
committer Wolfgang Bangerth <bangerth@math.tamu.edu>
Mon, 22 Jan 2001 08:23:04 +0000 (08:23 +0000)
diff --git a/deal.II/configure b/deal.II/configure

index 6fad6fe923f98d3e25848233d0dff36bdc36a4f8..7926e6445e1f1402d32d4dd16aed891ee4e6adfe 100755 (executable)
--- a/deal.II/configure
+++ b/deal.II/configure
@@ -37,7 +37,7 @@
  
  
  
->>>>>>> 1.18.2.1
+
  # Guess values for system-dependent variables and create Makefiles.
  # Generated automatically using autoconf version 2.13 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
author	Wolfgang Bangerth <bangerth@math.tamu.edu>
	Mon, 22 Jan 2001 08:23:04 +0000 (08:23 +0000)
committer	Wolfgang Bangerth <bangerth@math.tamu.edu>
	Mon, 22 Jan 2001 08:23:04 +0000 (08:23 +0000)