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

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

448db7ac4ccac4fe0400837379ef341f0be3143e