Fix merge conflict
authorMichael Rasmussen <mir@datanom.net>
Wed, 17 Mar 2021 15:36:53 +0000 (16:36 +0100)
committerMichael Rasmussen <mir@datanom.net>
Wed, 17 Mar 2021 15:36:53 +0000 (16:36 +0100)
commitc79a52334e9cb36273182aea79db6d99a2f09e8a
tree7849078840164b176cc54322c422df43ba96d20c
parent1135efc54dcf4a6ec5b39be7cb6d5b0255f30dab
parent8033e76e6a6ac3d193a8ed90982ecdcbaaeff282
Fix merge conflict

Signed-off-by: Michael Rasmussen <mir@datanom.net>
AUTHORS