Generated.

[homepage.git] / blog / The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html

diff --git a/blog/The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html b/blog/The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html
index 441a13b5c121c9b1d3e94f592a043735767439aa..ac2531e67903e58326b14b563c2c1ffa592c0665 100644 (file)
--- a/blog/The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html
+++ b/blog/The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.html
@@ -252,7 +252,11 @@ Congressman of the Republic of Perú.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.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.63
 
 </ul></li>
 
@@ -366,7 +370,11 @@ Congressman of the Republic of Perú.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.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.63
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -396,8 +404,13 @@ Congressman of the Republic of Perú.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< The_reply_from_Edgar_Villanueva_to_Microsoft_in_Peru.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.63
  <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>