Merge pull request #2257 from antmicro/fix-conflicts
authorclairexen <claire@symbioticeda.com>
Wed, 15 Jul 2020 09:49:09 +0000 (11:49 +0200)
committerGitHub <noreply@github.com>
Wed, 15 Jul 2020 09:49:09 +0000 (11:49 +0200)
commit021ce8e59646ed9a6dff4447e11cceae9d3e615c
tree175394ccfbc749c48f3ac0e057db630c7e78d566
parent61a7ec4768a3d0d0c8875bb4d9b6160f8697c0d6
parent02c071888b4b2a26db5653609bb60e6c3f5c366f
Merge pull request #2257 from antmicro/fix-conflicts

Restore #2203 and #2244 and fix parser conflicts