diff options
| author | Eddie Hung <eddieh@ece.ubc.ca> | 2018-11-13 12:12:26 -0800 |
|---|---|---|
| committer | Eddie Hung <eddieh@ece.ubc.ca> | 2018-11-13 12:12:26 -0800 |
| commit | 4134bfa78e9d56593ee306e482f778e5fc04f3d0 (patch) | |
| tree | b9417fd07f87fd564554b76071063696e8a2f026 /common/settings.h | |
| parent | 2d39cde17be718d76e6f5c06c8f06c70d44c7918 (diff) | |
| download | nextpnr-4134bfa78e9d56593ee306e482f778e5fc04f3d0.tar.gz nextpnr-4134bfa78e9d56593ee306e482f778e5fc04f3d0.tar.bz2 nextpnr-4134bfa78e9d56593ee306e482f778e5fc04f3d0.zip | |
[timing] Resolve another merge conflict
Diffstat (limited to 'common/settings.h')
0 files changed, 0 insertions, 0 deletions