Merge branch 'main' of http://114.214.202.87:9030/yangshenbo/UDP_data_process

2025-12-04 18:33:08 +08:00 · 2025-12-04 18:33:08 +08:00 · 86836807be
parent 1ad9d3e1fc 3dc244fbc9
commit 86836807be
1 changed files with 5 additions and 0 deletions
--- a/try_smg/counter.v
+++ b/try_smg/counter.v
@ -9,6 +9,11 @@ begin
    if (!rst_n)
        count <= 0;
    else if (enable == 1'b1)
+<<<<<<< HEAD
        count <= count + 1;
 end//
+=======
+        count <= count + 1;//00sss
+end
+>>>>>>> 3dc244fbc9669daee2436d70f0933dbd577fece0
 endmodule