diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2012-06-25 12:27:00 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2012-06-25 12:27:00 +0000 |
commit | 8edc07bcb9f80357fc8a55bec6c0522739810f99 (patch) | |
tree | 15eab12b728e810098b9611e3fe2f049e4a018ea /sbin/isakmpd/if.h | |
parent | ee4734fca2dfdfbaa345e63924b9e1611dd9696d (diff) |
automake has different naming rules, I was mistaken, those require conflict
markers...
Diffstat (limited to 'sbin/isakmpd/if.h')
0 files changed, 0 insertions, 0 deletions