diff options
| author |   joris <joris@openbsd.org> | 2005-10-23 04:25:34 +0000 |
|---|---|---|
| committer | joris <joris@openbsd.org> | 2005-10-23 04:25:34 +0000 |
| commit | fb402e0f960e2af43cb60d42193fc67446cc99a8 (patch) | |
| tree | b21a0ca86a0d49edfc003ee747a64b9e34213698 /sys/dev/pci | |
| parent | better output; (diff) | |
| download | wireguard-openbsd-fb402e0f960e2af43cb60d42193fc67446cc99a8.tar.xz wireguard-openbsd-fb402e0f960e2af43cb60d42193fc67446cc99a8.zip | |
warn if conflicts were found during the merge;
Diffstat (limited to 'sys/dev/pci')
0 files changed, 0 insertions, 0 deletions