Generated.

[homepage.git] / blog / Broken_umask_handling_with_sshfs.html

diff --git a/blog/Broken_umask_handling_with_sshfs.html b/blog/Broken_umask_handling_with_sshfs.html
index a5af38c857cf53d053ffb1788978ee5369991943..559da701ba41ab7882e783aab388eae58a19b930 100644 (file)
--- a/blog/Broken_umask_handling_with_sshfs.html
+++ b/blog/Broken_umask_handling_with_sshfs.html
@@ -155,11 +155,7 @@ script so useful that he created a GIT repository and stored it in
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
-<<<<<<< Broken_umask_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.111
 
 </ul></li>
 
@@ -273,11 +269,7 @@ script so useful that he created a GIT repository and stored it in
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
-<<<<<<< Broken_umask_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.111
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -307,13 +299,8 @@ script so useful that he created a GIT repository and stored it in
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
-<<<<<<< Broken_umask_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.111
  <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>