-
Committer:
Breezy landing bot
-
Author(s):
Jelmer Vernooij
-
Date:
2021-03-21 18:27:26 UTC
-
mfrom:
(7674.2.2 fix-gitlab-conflicts)
-
Revision ID:
breezy.the.bot@gmail.com-20210321182726-golqnd2a5rodru5a
Fix handling of gitlab conflicts.
Merged from https://code.launchpad.net/~jelmer/brz/fix-gitlab-conflicts/+merge/399951