From: mike bayer <mike_mp@zzzcomputing.com>
Date: Wed, 31 Oct 2018 15:24:55 +0000 (+0000)
Subject: Merge "Move pk on single-inh subclass check below conflict resolution check"
X-Git-Tag: rel_1_3_0b1~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=abb12a9d81161ff01b5cde2740746d5da32c69a2;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Merge "Move pk on single-inh subclass check below conflict resolution check"
---

abb12a9d81161ff01b5cde2740746d5da32c69a2