New Upstream Snapshot - plink2
There were merge conflicts while merging a new upstream version.
More details
Historical runs
- upstream-merged-conflicts: Merging upstream version 2019+git20220729.1.fd84475+dfsg resulted in conflicts.
- upstream-merged-conflicts: Merging upstream version 2019+git20220721.1.c0a9e50+dfsg resulted in conflicts.
- upstream-merged-conflicts: Merging upstream version 2019+git20220410.1.514d88d resulted in conflicts.
- upstream-merged-conflicts: Merging upstream version 2019+git20220218.1.2e07b9f resulted in conflicts.
- worker-timeout: No keepalives received in 10:00:10.590514.
- nothing-to-do: Nothing to do.
- upstream-merged-conflicts: Merging upstream version 2019+git20220217.1.5ee527d resulted in conflicts.
- upstream-merged-conflicts: Merging upstream version 2019+git20220217.1.5ee527d resulted in conflicts.