From: Wolfgang Bangerth <bangerth@math.tamu.edu>
Date: Mon, 22 Jan 2001 08:23:04 +0000 (+0000)
Subject: .
X-Git-Tag: v8.0.0~19803
X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b48f8b90d4750b495531c656689e700979373e30;p=dealii.git

.


git-svn-id: https://svn.dealii.org/trunk@3743 0785d39b-7218-0410-832d-ea1e28bc413d
---

diff --git a/deal.II/configure b/deal.II/configure
index 6fad6fe923..7926e6445e 100755
--- 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.