aabbcc
This commit is contained in:
parent
86836807be
commit
8ca87ff502
|
|
@ -9,11 +9,7 @@ begin
|
||||||
if (!rst_n)
|
if (!rst_n)
|
||||||
count <= 0;
|
count <= 0;
|
||||||
else if (enable == 1'b1)
|
else if (enable == 1'b1)
|
||||||
<<<<<<< HEAD
|
count <= count + 1;//aabbcc
|
||||||
count <= count + 1;
|
|
||||||
end//
|
|
||||||
=======
|
|
||||||
count <= count + 1;//00sss
|
|
||||||
end
|
end
|
||||||
>>>>>>> 3dc244fbc9669daee2436d70f0933dbd577fece0
|
|
||||||
endmodule
|
endmodule
|
||||||
Loading…
Reference in New Issue