X-Git-Url: http://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/8b85bd40cd4064aed586dda320e4f635816e4b54..923b4898cf78ff810ace3dac6439e6656f30d5f5:/blog/Broken_hard_link_handling_with_sshfs.html

diff --git a/blog/Broken_hard_link_handling_with_sshfs.html b/blog/Broken_hard_link_handling_with_sshfs.html
index 6eb1cf26bb..eca0fb092b 100644
--- a/blog/Broken_hard_link_handling_with_sshfs.html
+++ b/blog/Broken_hard_link_handling_with_sshfs.html
@@ -79,7 +79,11 @@ git from
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Broken_hard_link_handling_with_sshfs.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.106
 
 </ul></li>
 
@@ -193,7 +197,11 @@ git from
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Broken_hard_link_handling_with_sshfs.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.106
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -223,8 +231,13 @@ git from
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Broken_hard_link_handling_with_sshfs.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.106
  <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>