Generated.

[homepage.git] / blog / Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html

diff --git a/blog/Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html b/blog/Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html
index 8a80518572703aa1abd34f9e53f1fd60d020ad8a..09d871239ed6cf1a5ddef437edc36357d0ffbe92 100644 (file)
--- a/blog/Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html
+++ b/blog/Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.html
@@ -98,7 +98,11 @@ donations to the address
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.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.69
 
 </ul></li>
 
@@ -212,7 +216,11 @@ donations to the address
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.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.69
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -242,8 +250,13 @@ donations to the address
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Now_accepting_bitcoins___anonymous_and_distributed_p2p_crypto_money.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.69
  <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>