X-Git-Url: http://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/923b4898cf78ff810ace3dac6439e6656f30d5f5..13c5a09b1f4059edd60498a087eb45149c37d91f:/blog/More_flexible_firmware_handling_in_debian_installer.html

diff --git a/blog/More_flexible_firmware_handling_in_debian_installer.html b/blog/More_flexible_firmware_handling_in_debian_installer.html
index 3858cdf7be..6f63b6b4e1 100644
--- a/blog/More_flexible_firmware_handling_in_debian_installer.html
+++ b/blog/More_flexible_firmware_handling_in_debian_installer.html
@@ -97,11 +97,9 @@ contact us on debian-boot@lists.debian.org.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< More_flexible_firmware_handling_in_debian_installer.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.153
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (4)</a></li>
+
+<li><a href="http://people.skolelinux.org/pere/blog/archive/2011/10/">October (1)</a></li>
 
 </ul></li>
 
@@ -197,7 +195,7 @@ contact us on debian-boot@lists.debian.org.</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 (97)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/fiksgatami">fiksgatami (12)</a></li>
 
@@ -215,17 +213,13 @@ contact us on debian-boot@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< More_flexible_firmware_handling_in_debian_installer.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.153
 
  <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 (24)</a></li>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/personvern">personvern (45)</a></li>
 
@@ -249,14 +243,9 @@ contact us on debian-boot@lists.debian.org.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< More_flexible_firmware_handling_in_debian_installer.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.153
- <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>