Generated.

[homepage.git] / blog / Standardkrav_inn_i_anbudstekster_.html

diff --git a/blog/Standardkrav_inn_i_anbudstekster_.html b/blog/Standardkrav_inn_i_anbudstekster_.html
index b70e52fec2b35b88a88682622b67cef939bf41ce..a3dfa43e31a563de0735cbe70b2e22fe7d8acbef 100644 (file)
--- a/blog/Standardkrav_inn_i_anbudstekster_.html
+++ b/blog/Standardkrav_inn_i_anbudstekster_.html
@@ -124,7 +124,11 @@ skal spesifisere hvordan seriell-konsoll skal fungere.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 

+<<<<<<< Standardkrav_inn_i_anbudstekster_.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>
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/09/">September (2)</a></li>

+>>>>>>> 1.90

 
 </ul></li>
 
 
 </ul></li>
 


@@ -238,7 +242,11 @@ skal spesifisere hvordan seriell-konsoll skal fungere.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 

+<<<<<<< Standardkrav_inn_i_anbudstekster_.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>
  <li><a href="http://people.skolelinux.org/pere/blog/tags/norsk">norsk (136)</a></li>

+>>>>>>> 1.90

 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 


@@ -268,8 +276,13 @@ skal spesifisere hvordan seriell-konsoll skal fungere.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 

+<<<<<<< Standardkrav_inn_i_anbudstekster_.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>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/valg">valg (5)</a></li>
 

+>>>>>>> 1.90

  <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>
  <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>