X-Git-Url: https://pere.pagekite.me/gitweb/homepage.git/blobdiff_plain/731de269dafd5a472cc57ec6aaa815c6ef289719..923b4898cf78ff810ace3dac6439e6656f30d5f5:/blog/Using_bar_codes_at_a_computing_center.html diff --git a/blog/Using_bar_codes_at_a_computing_center.html b/blog/Using_bar_codes_at_a_computing_center.html index 899ef35c79..ae509eb2d9 100644 --- a/blog/Using_bar_codes_at_a_computing_center.html +++ b/blog/Using_bar_codes_at_a_computing_center.html @@ -97,7 +97,11 @@ easier automatic tracking of computers.

  • August (6)
  • +<<<<<<< Using_bar_codes_at_a_computing_center.html +
  • September (3)
  • +=======
  • September (2)
  • +>>>>>>> 1.227 @@ -211,7 +215,11 @@ easier automatic tracking of computers.

  • multimedia (13)
  • +<<<<<<< Using_bar_codes_at_a_computing_center.html +
  • norsk (137)
  • +=======
  • norsk (136)
  • +>>>>>>> 1.227
  • nuug (119)
  • @@ -241,8 +249,13 @@ easier automatic tracking of computers.

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