X-Git-Url: https://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/731de269dafd5a472cc57ec6aaa815c6ef289719..923b4898cf78ff810ace3dac6439e6656f30d5f5:/blog/Free_Software_vs__proprietary_softare___.html diff --git a/blog/Free_Software_vs__proprietary_softare___.html b/blog/Free_Software_vs__proprietary_softare___.html index 51788c4f16..f6b0124e9b 100644 --- a/blog/Free_Software_vs__proprietary_softare___.html +++ b/blog/Free_Software_vs__proprietary_softare___.html @@ -66,7 +66,11 @@ the time to read their content, the terms are simply unacceptable.

  • August (6)
    • +<<<<<<< Free_Software_vs__proprietary_softare___.html +
  • September (3)
    • +=======
  • September (2)
    • +>>>>>>> 1.17 @@ -180,7 +184,11 @@ the time to read their content, the terms are simply unacceptable.

  • multimedia (13)
    • +<<<<<<< Free_Software_vs__proprietary_softare___.html +
  • norsk (137)
    • +=======
  • norsk (136)
    • +>>>>>>> 1.17
  • nuug (119)
    • @@ -210,8 +218,13 @@ the time to read their content, the terms are simply unacceptable.

  • surveillance (9)
    • +<<<<<<< Free_Software_vs__proprietary_softare___.html +
  • valg (6)
    • + +=======
  • valg (5)
    • +>>>>>>> 1.17
  • video (20)
  • vitenskap (1)