removed merge conflichts
This commit is contained in:
@@ -40,3 +40,7 @@ clk
|
||||
jmp
|
||||
pc
|
||||
bfpu
|
||||
hardcoded
|
||||
logisim
|
||||
intoLogisim
|
||||
unallocated
|
||||
|
||||
Reference in New Issue
Block a user