summaryrefslogtreecommitdiff
path: root/ospf6d/ospf6_network.h
diff options
context:
space:
mode:
authorPaul Jakma <paul@quagga.net>2011-03-29 14:18:49 +0100
committerPaul Jakma <paul@quagga.net>2011-03-29 14:18:49 +0100
commit31d0f1b3c64903d56a47caebf887067d222c7cd6 (patch)
tree7a7d90f0517bc2816fc0279f79b5d7a9ab195095 /ospf6d/ospf6_network.h
parentf5a4827db60545309d0ee378b85acac56cf7837a (diff)
bgpd: Fix merge error in jhash commit
* bgp_attr.c: (attrhash_key_make) 98e30f should have changed jhash2 to jhash. These kinds of merge errors would be reduced and life would be easier if people would submit fully-formed fixes that could be chucked directly into git-am.
Diffstat (limited to 'ospf6d/ospf6_network.h')
0 files changed, 0 insertions, 0 deletions