# HG changeset patch
# User Franz Glasner <fzglas.hg@dom66.de>
# Date 1664895938 -7200
# Node ID 0e2afa9bbef8096c2594d18d2d8ef496c21c2e11
# Parent  60cd0d144d3ad78afd4910e6841fa704d24c1ccf# Parent  142d33a42894070d15177dc9cf49b6e8ae5d4aa1
MERGE: divergent dev: duplicate work