Typo.

[homepage.git] / blog / Why_isn_t_Debian_Edu_using_VLC_.html

diff --git a/blog/Why_isn_t_Debian_Edu_using_VLC_.html b/blog/Why_isn_t_Debian_Edu_using_VLC_.html
index e17910e1bec6889e2681f1071826c2d4688acf63..ed52dd2a46894554116d9346c647f27b08c3a77a 100644 (file)
--- a/blog/Why_isn_t_Debian_Edu_using_VLC_.html
+++ b/blog/Why_isn_t_Debian_Edu_using_VLC_.html
@@ -87,11 +87,7 @@ what is going on.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Why_isn_t_Debian_Edu_using_VLC_.html
-<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (3)</a></li>
-=======
-<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (2)</a></li>
->>>>>>> 1.73
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (4)</a></li>
 
 </ul></li>
 
@@ -187,7 +183,7 @@ what is going on.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/digistan">digistan (7)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/english">english (95)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/english">english (96)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/fiksgatami">fiksgatami (12)</a></li>
 
@@ -205,17 +201,13 @@ what is going on.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Why_isn_t_Debian_Edu_using_VLC_.html
  <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (137)</a></li>
-=======
- <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (136)</a></li>
->>>>>>> 1.73
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/open311">open311 (2)</a></li>
 
- <li><a href="http://people.skolelinux.org/pere/blog/tags/opphavsrett">opphavsrett (22)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/opphavsrett">opphavsrett (23)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern (45)</a></li>
 
@@ -239,14 +231,9 @@ what is going on.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Why_isn_t_Debian_Edu_using_VLC_.html
  <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (6)</a></li>
 
-=======
- <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (5)</a></li>
-
->>>>>>> 1.73
- <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (20)</a></li>
+ <li><a href="http://people.skolelinux.org/pere/blog/tags/video">video (21)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/vitenskap">vitenskap (1)</a></li>