update

2019-11-22 12:30:21 -05:00
parent 82ba8be98b
commit 728e9a71b3
9 changed files with 2 additions and 61 deletions
--- a/rtl/VX_define.v
+++ b/rtl/VX_define.v
@@ -11,13 +11,8 @@
 // `define ONLY

 // `define SYN 1
-<<<<<<< HEAD
-//`define ASIC 1
-//`define SYN_FUNC 1
-=======
 // `define ASIC 1
 // `define SYN_FUNC 1
->>>>>>> d4f6a7e3b221ae64441558037b40b87dbf432798

 `define NUM_BARRIERS 4