Fix merge conflict.
authorWayne Davison <wayne@opencoder.net>
Mon, 13 Jul 2020 06:51:08 +0000 (23:51 -0700)
committerWayne Davison <wayne@opencoder.net>
Mon, 13 Jul 2020 06:51:08 +0000 (23:51 -0700)
commitcac05bfb779ad97f1cff062493fbe4e25f27c7eb
tree8fe03af391d33d2fc7668f544ee85e39b9ebde34
parent8e45a9371e808319479b7687b7a0fb5fdb2f1139
Fix merge conflict.
checksum-reading.diff