Generated.

[homepage.git] / blog / Some_notes_on_Flash_in_Debian_and_Debian_Edu.html

diff --git a/blog/Some_notes_on_Flash_in_Debian_and_Debian_Edu.html b/blog/Some_notes_on_Flash_in_Debian_and_Debian_Edu.html
index 8b60042cfa8d1c1066d3491255f6624c2af6303b..50fcc176cb9ef06602add84b978876e9489d6afc 100644 (file)
--- a/blog/Some_notes_on_Flash_in_Debian_and_Debian_Edu.html
+++ b/blog/Some_notes_on_Flash_in_Debian_and_Debian_Edu.html
@@ -96,7 +96,11 @@ accept the new package into Squeeze.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Some_notes_on_Flash_in_Debian_and_Debian_Edu.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.104
 
 </ul></li>
 
@@ -210,7 +214,11 @@ accept the new package into Squeeze.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Some_notes_on_Flash_in_Debian_and_Debian_Edu.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.104
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -240,8 +248,13 @@ accept the new package into Squeeze.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Some_notes_on_Flash_in_Debian_and_Debian_Edu.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.104
  <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>