You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or mute the thread.
@aferust: I can resolve the conflicts if you like because they come from my PR #864. Doing that will change your PR and branch aferust:master.
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub, or mute the thread.