Fix merge issues
authorEddie Hung <eddie@fpgeh.com>
Sat, 5 Oct 2019 00:21:14 +0000 (17:21 -0700)
committerEddie Hung <eddie@fpgeh.com>
Sat, 5 Oct 2019 00:21:14 +0000 (17:21 -0700)
commit7959e9d6b25d7afefded4b14e14ccf2b0b5af553
tree000580f4fe0ce2f3109b65534f6947c92c420681
parent7a45cd58566310f623bd567a393beb8a734ebf60
Fix merge issues
backends/aiger/xaiger.cc
frontends/aiger/aigerparse.cc
passes/techmap/abc9.cc
passes/techmap/techmap.cc
techlibs/xilinx/abc9_map.v
techlibs/xilinx/abc9_unmap.v