X-Git-Url: https://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/731de269dafd5a472cc57ec6aaa815c6ef289719..923b4898cf78ff810ace3dac6439e6656f30d5f5:/blog/Debian_in_3D.html
diff --git a/blog/Debian_in_3D.html b/blog/Debian_in_3D.html
index 4422dc736a..1ffbfdcc59 100644
--- a/blog/Debian_in_3D.html
+++ b/blog/Debian_in_3D.html
@@ -62,7 +62,11 @@ thingiverse blog.
August (6)
+<<<<<<< Debian_in_3D.html
+September (3)
+=======
September (2)
+>>>>>>> 1.82
@@ -176,7 +180,11 @@ thingiverse blog.
multimedia (13)
+<<<<<<< Debian_in_3D.html
+ norsk (137)
+=======
norsk (136)
+>>>>>>> 1.82
nuug (119)
@@ -206,8 +214,13 @@ thingiverse blog.
surveillance (9)
+<<<<<<< Debian_in_3D.html
+ valg (6)
+
+=======
valg (5)
+>>>>>>> 1.82
video (20)
vitenskap (1)