删除不合理的冲突合并代码
This commit is contained in:
@@ -51,8 +51,6 @@ abstract class ShinTopBase extends Module{
|
||||
|
||||
interface.io.latchPin := io.latchPin
|
||||
|
||||
interface.io.latchPin := io.latchPin
|
||||
|
||||
io.ledTest := RegNext( Cat(slaveParser.io.intHWTrig(0), slaveParser.io.intHWTrig(1)) )
|
||||
|
||||
io.isSoftReset := interface.io.isSoftReset
|
||||
|
||||
Reference in New Issue
Block a user