From 54798f4e468624e255a429179f47a2998163d571 Mon Sep 17 00:00:00 2001
From: ben <ben@766a2236-cff9-0310-b0c0-a81a5f92509a>
Date: Tue, 30 Oct 2007 13:29:33 +0000
Subject: [PATCH] gr, mergin problems

git-svn-id: svn+ssh://en.codiert.org/home/staff/ben/dev/misc.svn/projects/fpgafs@445 766a2236-cff9-0310-b0c0-a81a5f92509a
---
 doc/www/index.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/doc/www/index.html b/doc/www/index.html
index 955cb90..0d9ee68 100644
--- a/doc/www/index.html
+++ b/doc/www/index.html
@@ -95,13 +95,9 @@
 	<h2 class="consol">$ svn co https://svn.subgra.de/ben/projects/fpgafs</h2>
 
 	<h2 class="title">Contact</h2><a name="contact" id="contact"></a>
-<<<<<<< .mine
-	<p>Benjamin Krill: ben@codiert.org</p>
-=======
 	<p>Benjamin Krill: ben@codiert.org</p>
 
 	<h2 class="footer">$Id$</h3>
->>>>>>> .r443
 </div>
 
 </body>