diff options
author | Renato Botelho <renato@netgate.com> | 2015-11-05 11:05:27 -0200 |
---|---|---|
committer | Renato Botelho <renato@netgate.com> | 2015-11-05 11:05:27 -0200 |
commit | 1ad936a0dd796a703acc3a6bffa4823ab4b619fe (patch) | |
tree | b6cf15f9bfe806b23ee0aba431166858201cbcee /sys/net/if_dead.c | |
parent | c7275b999acdea9746ff095cf10188b4a3d09b7a (diff) | |
download | FreeBSD-src-1ad936a0dd796a703acc3a6bffa4823ab4b619fe.zip FreeBSD-src-1ad936a0dd796a703acc3a6bffa4823ab4b619fe.tar.gz |
Fix a bad merge conflict resolution from c7275b999
Diffstat (limited to 'sys/net/if_dead.c')
0 files changed, 0 insertions, 0 deletions