diff options
| author | Kamil Rakoczy <krakoczy@antmicro.com> | 2020-07-10 14:56:14 +0200 |
|---|---|---|
| committer | Kamil Rakoczy <krakoczy@antmicro.com> | 2020-07-10 15:03:53 +0200 |
| commit | d77b3305d83f6877f2177daecab658067659f4ce (patch) | |
| tree | 1863390e2ae5805c6a5e59c49ddb9c56c6e4ecb5 /techlibs/sf2 | |
| parent | 0ffaddee5e6422c74fd002f9b1272cfe40839a13 (diff) | |
| download | yosys-d77b3305d83f6877f2177daecab658067659f4ce.tar.gz yosys-d77b3305d83f6877f2177daecab658067659f4ce.tar.bz2 yosys-d77b3305d83f6877f2177daecab658067659f4ce.zip | |
Fix S/R conflicts
This commit fixes S/R conflicts introduced by commit 6f9be93.
Signed-off-by: Kamil Rakoczy <krakoczy@antmicro.com>
Diffstat (limited to 'techlibs/sf2')
0 files changed, 0 insertions, 0 deletions