Merge pull request #2210 from YosysHQ/mwk/fix-opt_merge
authorclairexen <claire@symbioticeda.com>
Thu, 2 Jul 2020 15:43:34 +0000 (17:43 +0200)
committerGitHub <noreply@github.com>
Thu, 2 Jul 2020 15:43:34 +0000 (17:43 +0200)
opt_merge: use the master FF type list


Trivial merge