Merge branch 'master' of jspc28.x-matter.uni-frankfurt.de:daqtools

diff --cc base/serials_dirich.db
index 66ee7406efc0124eb5919335d3149a09cd13403c,14317a9684238f7f6a5b657e569b7b1be67c9f45..857e520981ae7cfe60d8e31bacf41e7844472802
--- 1/base/serials_dirich.db
--- 2/base/serials_dirich.db
+++ b/base/serials_dirich.db
@@@ -940,10 -940,7 +941,14 @@@
  9231  0x7100000a49e0e728 # dirich3  untested
  9241  0xdd00000a494eb928 # dirich3  untested MACHXo3 not programmed -> JTAG prob.
  9251  0x8900000a48dfb128 # dirich3  untested
++<<<<<<< HEAD
 +9261    0xd500000a49406b28 # dirich3  untested
 +9281    0x0300000a525aa428 # dirich3  untested
 +10301   0x4100000a4917a128 # dirich3  untested
 +10311   0xaa00000a4917a428 # dirich3  untested
++=======
+ 10301   0x4100000a4917a128 #test
++>>>>>>> b0291c6ff6b9e056ca23dd0424169c7525c7cbe7
  10331   0x0600000a49897828 # dirich3  untested
  10341   0x6100000a49bc4c28 # dirich3  untested
  10361   0xf700000a49bc4528 # dirich3  untested