projects / yosys.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0ffadde) | patch
Fix S/R conflicts
authorKamil Rakoczy <krakoczy@antmicro.com>
Fri, 10 Jul 2020 12:56:14 +0000 (14:56 +0200)
committerKamil Rakoczy <krakoczy@antmicro.com>
Fri, 10 Jul 2020 13:03:53 +0000 (15:03 +0200)
commitd77b3305d83f6877f2177daecab658067659f4ce
tree1863390e2ae5805c6a5e59c49ddb9c56c6e4ecb5tree
parent0ffaddee5e6422c74fd002f9b1272cfe40839a13commit | diff
Fix S/R conflicts

This commit fixes S/R conflicts introduced by commit 6f9be93.

Signed-off-by: Kamil Rakoczy <krakoczy@antmicro.com>
frontends/verilog/verilog_parser.y diff | blob | history