resolve stupid conflict

svn path=/trunk/; revision=28150
pull/8/head
Max Mehl 2014-02-24 14:50:09 +00:00
parent c033e1e4db
commit a702b93095
1 changed files with 1 additions and 1 deletions

View File

@ -179,7 +179,7 @@ runs with Free Software or from</li>
who appreciates especially the independence gained by the usage of Free
Software. </li>
<li><a href="http://linuxundich.de/ubuntu/heute-ist-der-i-love-free-software-tag-2014/">Christoph Langner</a>
loves the political and democratical aspect of Free Software whereas </li>
loves the political and democratical aspect of Free Software whereas</li>
<li><a href="http://oskar.twoday.net/stories/689714069/">Oskar Welzl</a>
used the #ilovefs day for telling interested co-workers about the importance of
Free Software. The</li>