Fix unresolved conflict from #1573
authorEddie Hung <eddie@fpgeh.com>
Tue, 28 Jan 2020 18:17:47 +0000 (10:17 -0800)
committerEddie Hung <eddie@fpgeh.com>
Tue, 28 Jan 2020 18:17:47 +0000 (10:17 -0800)
commit245b8c4ab64c5c3bd7b9f71f94316a76a2576fd1
treec5932c507f7f2817037fad178f50229e6e6400f0
parent4ddaa70fd6363096bf0cb1bc5e7cb8fa8ed21ad2
Fix unresolved conflict from #1573
techlibs/xilinx/synth_xilinx.cc