Generated.

[homepage.git] / 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 3858cdf7be20dd5d4c182aebd228a25aa447a584..04d0d348638541f94004acb169c19a839eca44ad 100644 (file)
--- a/blog/More_flexible_firmware_handling_in_debian_installer.html
+++ b/blog/More_flexible_firmware_handling_in_debian_installer.html
@@ -97,11 +97,7 @@ 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
 
 </ul></li>
 
@@ -215,11 +211,7 @@ 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>
 
@@ -249,13 +241,8 @@ 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/vitenskap">vitenskap (1)</a></li>