X-Git-Url: https://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/731de269dafd5a472cc57ec6aaa815c6ef289719..923b4898cf78ff810ace3dac6439e6656f30d5f5:/blog/Software_video_mixer_on_a_USB_stick.html

diff --git a/blog/Software_video_mixer_on_a_USB_stick.html b/blog/Software_video_mixer_on_a_USB_stick.html
index 53a2115cf2..6e9cbc4f47 100644
--- a/blog/Software_video_mixer_on_a_USB_stick.html
+++ b/blog/Software_video_mixer_on_a_USB_stick.html
@@ -80,7 +80,11 @@ larger stick as well.</p>
 
 <li><a href="http://people.skolelinux.org/pere/blog/archive/2011/08/">August (6)</a></li>
 
+<<<<<<< Software_video_mixer_on_a_USB_stick.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.243
 
 </ul></li>
 
@@ -194,7 +198,11 @@ larger stick as well.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/multimedia">multimedia (13)</a></li>
 
+<<<<<<< Software_video_mixer_on_a_USB_stick.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.243
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/nuug">nuug (119)</a></li>
 
@@ -224,8 +232,13 @@ larger stick as well.</p>
 
  <li><a href="http://people.skolelinux.org/pere/blog/tags/surveillance">surveillance (9)</a></li>
 
+<<<<<<< Software_video_mixer_on_a_USB_stick.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.243
  <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>