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
This commit is contained in:
parent
efb9050fff
commit
54798f4e46
@ -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>
|
||||
|
Loading…
Reference in New Issue
Block a user