diff options
| author | Jakob Schlyter <jakob@cvs.openbsd.org> | 2007-12-09 13:39:46 +0000 |
|---|---|---|
| committer | Jakob Schlyter <jakob@cvs.openbsd.org> | 2007-12-09 13:39:46 +0000 |
| commit | 1173d5eff8dc423c129f442023419436ee94db23 (patch) | |
| tree | 57c2bcdc1429b2e80b91a387cd1dc561dab988eb /sbin/isakmpd/ui.c | |
| parent | e4a92ccc5f8c866478b32a346c71150a2cdf5001 (diff) | |
resolve conflicts
Diffstat (limited to 'sbin/isakmpd/ui.c')
0 files changed, 0 insertions, 0 deletions