public/fpgafs
1
0
Fork 0
Code Pull Requests Releases Activity

gr, mergin problems

Browse Source 
git-svn-id: svn+ssh://en.codiert.org/home/staff/ben/dev/misc.svn/projects/fpgafs@445 766a2236-cff9-0310-b0c0-a81a5f92509a
This commit is contained in:
ben 2007-10-30 13:29:33 +00:00
parent efb9050fff
commit 54798f4e46
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/www/index.html
View File

@ -95,13 +95,9 @@
<h2 class="consol">$ svn co https://svn.subgra.de/ben/projects/fpgafs</h2> <h2 class="consol">$ svn co https://svn.subgra.de/ben/projects/fpgafs</h2>
<h2 class="title">Contact</h2><a name="contact" id="contact"></a> <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> <p>Benjamin Krill: ben@codiert.org</p>
<h2 class="footer">$Id$</h3> <h2 class="footer">$Id$</h3>
>>>>>>> .r443
</div> </div>
</body> </body>