aabbcc

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