Meh, GH's "fix conflicts" creates this strange merge commit that we don't want.
Thought I'd fix it as its kinda my fault the conflict exists, but this only
makes it worse... Care to do a rebase to clean it up? Thanks, and sorry about
the mess.
--
You are receiving this because you are subscribed to this thread.
Reply to this email directly or view it on GitHub:
https://github.com/rpm-software-management/rpm/pull/1163#issuecomment-617097347
_______________________________________________
Rpm-maint mailing list
Rpm-maint@lists.rpm.org
http://lists.rpm.org/mailman/listinfo/rpm-maint
